just to resolve a dummy conflict

[wxWidgets.git] / src / common / http.cpp

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 19b1edf023052df280bf08c481c4304284d89d40..c13c7a1bb7695d73f609aec8683a7f4fb0b29c1a 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -10,21 +10,18 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "http.h"
+  #pragma implementation "http.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
 #if wxUSE_SOCKETS
 
-#ifndef WX_PRECOMP
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include "wx/string.h"
@@ -129,9 +126,8 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
-    printf("Header: %s\n", WXSTRINGCAST line);
     tokenzr.SetString(line, " :\t\n\r");
-    if (!tokenzr.HasMoreToken())
+    if (!tokenzr.HasMoreTokens())
       return FALSE;
 
     wxString left_str = tokenzr.GetNextToken();
@@ -198,7 +194,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   SetFlags(NONE);
   Notify(FALSE);
 
-  sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char*)pathbuf);
+  sprintf(buf, "%s %s\n\r", tmp_buf, (const char*) pathbuf);
   Write(buf, strlen(buf));
   SendHeaders();
   sprintf(buf, "\n\r");