fixed http header bug

shiyezheng · Jul 7, 2017 · 9b95afa · 9b95afa
1 parent d60f006
commit 9b95afa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/mars/app/app_logic.cc b/mars/app/app_logic.cc
@@ -31,13 +31,16 @@
 
 #include "mars/app/app_logic.h"
 
+#ifdef __APPLE__
 #include <TargetConditionals.h>
+#endif
 
 #include "mars/comm/xlogger/xlogger.h"
 #include "mars/comm/bootrun.h"
 #include "mars/comm/thread/mutex.h"
 #include "mars/comm/thread/lock.h"
 #include "mars/comm/thread/thread.h"
+#include "mars/comm/time_utils.h"
 #include "mars/comm/dns/dns.h"
 #include "mars/baseevent/baseprjevent.h"
 
@@ -125,7 +128,7 @@ void SetCallback(Callback* const callback) {
 
 #if !TARGET_OS_IPHONE
         mars::comm::ProxyInfo proxy_info;
-        sg_callback->GetProxyInfo(_host, proxy_info)
+        sg_callback->GetProxyInfo(_host, proxy_info);
         return proxy_info;
 #endif
 

diff --git a/mars/app/win32proj/app.vcxproj b/mars/app/win32proj/app.vcxproj
@@ -60,7 +60,7 @@
       <ForcedIncludeFiles>mars/comm/projdef.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(ProjectDir)../../../;$(ProjectDir)../../comm/windows/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../comm/;$(ProjectDir)../../;$(ProjectDir)../../../;$(ProjectDir)../../comm/windows/</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -79,7 +79,7 @@
       <ForcedIncludeFiles>mars/comm/projdef.h</ForcedIncludeFiles>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)../../../;$(ProjectDir)../../comm/windows/</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../comm/;$(ProjectDir)../../;$(ProjectDir)../../../;$(ProjectDir)../../comm/windows/</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/mars/comm/http.cc b/mars/comm/http.cc
@@ -701,9 +701,7 @@ Parser::TRecvStatus Parser::Recv(const void* _buffer, size_t _length) {
                     return recvstatus_;
                 }
 
-                recvstatus_ = kHeaderFields;
                 headerbuf_.Write(recvbuf_.Ptr(), firstlinelength);
-                recvbuf_.Move(- firstlinelength);
                 // HTTP/1.1 4.7 Unauthorized\r\n\r\n
                 char* pos_2crlf = string_strnstr(pBuf, "\r\n\r\n", (int)recvbuf_.Length());
                 if (NULL != pos_2crlf && pos_2crlf == pos) {

diff --git a/mars/comm/windows/thread/lock.h b/mars/comm/windows/thread/lock.h
@@ -18,6 +18,7 @@
 #include "assert/__assert.h"
 #include "thread/mutex.h"
 #include "thread/spinlock.h"
+#include "unistd.h"
 
 template <typename MutexType>
 class BaseScopedLock {