瀏覽代碼

Merge branch 'candidate-6.2.10' into candidate-6.4.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 年之前
父節點
當前提交
76936d349d
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      common/thorhelper/roxiehelper.cpp
  2. 1 1
      esp/bindings/http/platform/httptransport.cpp

+ 1 - 1
common/thorhelper/roxiehelper.cpp

@@ -1514,7 +1514,7 @@ bool CSafeSocket::readBlock(StringBuffer &ret, unsigned timeout, HttpHelper *pHt
                 const char *val = pHttpHelper->queryRequestHeader("Expect");
                 if (val && streq(val, "100-continue"))
                 {
-                    StringBuffer cont("HTTP/1.1 100 Continue\n\n"); //tell client to go ahead and send body
+                    StringBuffer cont("HTTP/1.1 100 Continue\r\n\r\n"); //tell client to go ahead and send body
                     sock->write(cont, cont.length());
                 }
 

+ 1 - 1
esp/bindings/http/platform/httptransport.cpp

@@ -608,7 +608,7 @@ int CHttpMessage::receive(bool alwaysReadContent, IMultiException *me)
     getHeader("Expect", expect);
     if (expect.length() && strieq(expect, "100-continue"))
     {
-        StringBuffer cont("HTTP/1.1 100 Continue\n\n"); //tell client to send body
+        StringBuffer cont("HTTP/1.1 100 Continue\r\n\r\n"); //tell client to send body
         m_socket.write(cont, cont.length());
     }