Compile fixes,

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 9d08ee7d801db18883c5b7eb57843855d93e3d5c..06cfbd02e8e5785647f434dd9be724713cb0b932 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -10,33 +10,31 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 #include "wx/tokenzr.h"
 #include "wx/socket.h"
 #include "wx/protocol/protocol.h"
+#include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
+IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE)
 #endif
 
 #define HTTP_BSIZE 2048
@@ -66,7 +64,7 @@ wxHTTP::~wxHTTP()
 
 wxString wxHTTP::GetContentType()
 {
-  return GetHeader("Content-Type");
+  return GetHeader(_T("Content-Type"));
 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
@@ -104,9 +102,10 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
 
     wxString buf;
-    buf.Printf("%s: %s\n\r", head->GetKeyString(), str->GetData());
+    buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
 
-    Write(buf, buf.Len());
+    const wxWX2MBbuf cbuf = buf.mb_str();
+    Write(cbuf, strlen(cbuf));
 
     head = head->Next();
   }
@@ -115,6 +114,7 @@ void wxHTTP::SendHeaders()
 bool wxHTTP::ParseHeaders()
 {
   wxString line;
+  wxStringTokenizer tokenzr;
 
   m_headers.Clear();
   m_read = TRUE;
@@ -127,17 +127,12 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
-    printf("Header: %s\n", WXSTRINGCAST line);
-    int pos = line.Find(':');
-    if (pos == -1)
+    tokenzr.SetString(line, " :\t\n\r");
+    if (!tokenzr.HasMoreTokens())
       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);
   }
@@ -163,7 +158,7 @@ bool wxHTTP::Connect(const wxString& host)
     return FALSE;
   }
 
-  if (!addr->Service("http"))
+  if (!addr->Service(_T("http")))
     addr->Service(80);
 
   return TRUE;
@@ -184,28 +179,29 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
-  char *tmp_buf;
-  char buf[HTTP_BSIZE];
+  wxChar *tmp_buf;
+  wxChar buf[200];
+  wxWX2MBbuf pathbuf(200);
+  wxString tmp_str;
 
   switch (req) {
   case wxHTTP_GET:
-    tmp_buf = "GET";
+    tmp_buf = _T("GET");
     break;
   default:
     return FALSE;
   }
 
   SaveState();
+  SetFlags(NONE);
   Notify(FALSE);
-  SetFlags(WAITALL);
 
-  sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char *)path);
-  Write(buf, strlen(buf));
+  tmp_str = wxURL::ConvertToValidURI(path);
+  wxSprintf(buf, _T("%s %s\n\r"), tmp_buf, tmp_str.GetData());
+  pathbuf = wxConvLibc.cWX2MB(buf);
+  Write(pathbuf, strlen(pathbuf));
   SendHeaders();
-  sprintf(buf, "\n\r");
-  Write(buf, strlen(buf));
-
-  wxString tmp_str;
+  Write("\n\r", 2);
 
   m_error = GetLine(this, tmp_str);
   if (m_error != wxPROTO_NOERR) {
@@ -213,22 +209,22 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     return FALSE;
   }
 
-  if (!tmp_str.Contains("HTTP/")) {
+  if (!tmp_str.Contains(_T("HTTP/"))) {
     // TODO: support HTTP v0.9 which can have no header.
-    SetHeader("Content-Length", "-1");
-    SetHeader("Content-Type", "none/none");
+    SetHeader(_T("Content-Length"), _T("-1"));
+    SetHeader(_T("Content-Type"), _T("none/none"));
     RestoreState();
     return TRUE;
   }
 
-  wxStringTokenizer token(tmp_str,' ');
+  wxStringTokenizer token(tmp_str,_T(' '));
   wxString tmp_str2;
   bool ret_value;
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 
-  switch (atoi(tmp_str2)) {
+  switch (wxAtoi(tmp_str2)) {
   case 200:
     break;
   default:
@@ -272,10 +268,11 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 
-  printf("Len = %s\n", WXSTRINGCAST GetHeader("Content-Length"));
-  if (!GetHeader("Content-Length").IsEmpty())
-    inp_stream->m_httpsize = atoi(WXSTRINGCAST GetHeader("Content-Length"));
+  wxPrintf(_T("Len = %s\n"), 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;
 }