Remaining Makefile.ins,

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index a50e3ea140b8877ed69c30ad1ce7d6793d3670a4..a7e14752b4574ee319fc3c99765788957fd91918 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -17,14 +17,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+  #include "wx/defs.h"

 #endif
 
 #endif
 

+#if wxUSE_SOCKETS
+

 #include <stdio.h>
 #include <stdlib.h>
 #include "wx/string.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "wx/string.h"


@@ -116,6 +117,7 @@ void wxHTTP::SendHeaders()
 bool wxHTTP::ParseHeaders()
 {
   wxString line;
 bool wxHTTP::ParseHeaders()
 {
   wxString line;

+  wxStringTokenizer tokenzr;

 
   m_headers.Clear();
   m_read = TRUE;
 
   m_headers.Clear();
   m_read = TRUE;


@@ -128,17 +130,12 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
     if (line.Length() == 0)
       break;
 

-    wxPrintf(_T("Header: %s\n"), WXSTRINGCAST line);
-    int pos = line.Find(':');
-    if (pos == -1)
+    tokenzr.SetString(line, " :\t\n\r");
+    if (!tokenzr.HasMoreTokens())

       return FALSE;
 
       return FALSE;
 

-    wxString left_str = line(0, pos);
-    wxString right_str = line(pos+1, line.Length());
-
-    right_str = right_str.Strip(wxString::leading);
-
-    wxString *str = new wxString(right_str);
+    wxString left_str = tokenzr.GetNextToken();
+    wxString *str = new wxString(tokenzr.GetNextToken());

 
     m_headers.Append(left_str, (wxObject *) str);
   }
 
     m_headers.Append(left_str, (wxObject *) str);
   }


@@ -198,10 +195,10 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   }
 
   SaveState();
   }
 
   SaveState();

+  SetFlags(NONE);

   Notify(FALSE);
   Notify(FALSE);

-  SetFlags(WAITALL);

 
 

-  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");
   Write(buf, strlen(buf));
   SendHeaders();
   sprintf(buf, "\n\r");


@@ -278,6 +275,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!GetHeader(_T("Content-Length")).IsEmpty())
     inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
 
   if (!GetHeader(_T("Content-Length")).IsEmpty())
     inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
 

+  SetFlags(WAITALL);

   return inp_stream;
 }
 
   return inp_stream;
 }