Merge branch 'fcarvajaldev-3.6.x-remove-old-proto-compat' into 3.6.x

1 files changed, 0 insertions, 40 deletions

diff --git a/nxcomp/ClientChannel.h b/nxcomp/ClientChannel.h
index 9924bb263..5ec55595c 100644
--- a/nxcomp/ClientChannel.h
+++ b/nxcomp/ClientChannel.h
@@ -158,23 +158,6 @@ class ClientChannel : public Channel
   int handleTaintRequest(unsigned char &opcode, const unsigned char *&buffer,
                              unsigned int &size)
   {
-    if (control -> isProtoStep7() == 0)
-    {
-      if (opcode == X_NXFreeSplit || opcode == X_NXAbortSplit ||
-              opcode == X_NXFinishSplit)
-      {
-        return handleTaintSplitRequest(opcode, buffer, size);
-      }
-      else if (opcode == X_NXSetCacheParameters)
-      {
-        return handleTaintCacheRequest(opcode, buffer, size);
-      }
-      else if (opcode == X_NXGetFontParameters)
-      {
-        return handleTaintFontRequest(opcode, buffer, size);
-      }
-    }
-
     if (control -> TaintReplies > 0 &&
             opcode == X_GetInputFocus)
     {
@@ -190,15 +173,6 @@ class ClientChannel : public Channel
     return 0;
   }
 
-  int handleTaintCacheRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                  unsigned int &size);
-
-  int handleTaintFontRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                 unsigned int &size);
-
-  int handleTaintSplitRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                  unsigned int &size);
-
   int handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
                                  unsigned int &size);
 
@@ -261,20 +235,6 @@ class ClientChannel : public Channel
 
   int handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum checksum);
 
-  void handleSplitEnable()
-  {
-    if (control -> isProtoStep7() == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplitEnable: WARNING! Disabling split "
-              << "with an old proxy version.\n"
-              << logofs_flush;
-      #endif
-
-      enableSplit_ = 0;
-    }
-  }
-
   void handleSplitPending(int resource)
   {
     if (splitState_.pending == 0)