Merge branch 'candidate-6.2.14' into candidate-6.4.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/thorhelper/roxiehelper.hpp

@@ -341,6 +341,7 @@ interface SafeSocket : extends IInterface
     virtual void sendSoapException(IException *E, const char *queryName) = 0;
     virtual void sendJsonException(IException *E, const char *queryName) = 0;
     virtual void setHttpMode(const char *queryName, bool arrayMode, HttpHelper &httphelper) = 0;
+    virtual void setHttpMode(bool mode) = 0;
     virtual void setHeartBeat() = 0;
     virtual bool sendHeartBeat(const IContextLogger &logctx) = 0;
     virtual void flush() = 0;
@@ -383,6 +384,7 @@ public:
     bool readBlock(MemoryBuffer &ret, unsigned maxBlockSize, unsigned timeout = (unsigned) WAIT_FOREVER);
     bool readBlock(StringBuffer &ret, unsigned timeout, HttpHelper *pHttpHelper, bool &, bool &, unsigned maxBlockSize);
     void setHttpMode(const char *queryName, bool arrayMode, HttpHelper &httphelper);
+    void setHttpMode(bool mode) override {httpMode = mode;}
     void setAdaptiveRoot(bool adaptive){adaptiveRoot=adaptive;}
     bool getAdaptiveRoot(){return adaptiveRoot;}
     void checkSendHttpException(HttpHelper &httphelper, IException *E, const char *queryName);

roxie/ccd/ccdprotocol.cpp

@@ -1520,6 +1520,7 @@ private:
 
         try
         {
+            client.setHttpMode(false); //For historical reasons HTTP mode really means SOAP/JSON, we want raw HTTP here.  Should be made more clear
             client.write(message.str(), message.length());
         }
         catch (IException *E)