Right-o, wxConv_local does cause some weird crashes, but things

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index c8f8b79a04427ed11892820a63d402a1a698b51d..a50e3ea140b8877ed69c30ad1ce7d6793d3670a4 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SOCKETS
+

 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 


@@ -34,7 +36,7 @@
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 
 #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
 #endif
 
 #define HTTP_BSIZE 2048


@@ -64,7 +66,7 @@ wxHTTP::~wxHTTP()
 
 wxString wxHTTP::GetContentType()
 {
 
 wxString wxHTTP::GetContentType()
 {

-  return GetHeader("Content-Type");
+  return GetHeader(_T("Content-Type"));

 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)


@@ -88,7 +90,7 @@ wxString wxHTTP::GetHeader(const wxString& header)
 {
   wxNode *node = m_headers.Find(header);
   if (!node)
 {
   wxNode *node = m_headers.Find(header);
   if (!node)

-    return (char *)NULL;
+    return wxEmptyString;

 
   return *((wxString *)node->Data());
 }
 
   return *((wxString *)node->Data());
 }


@@ -102,9 +104,10 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
 
     wxString buf;
     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();
   }
 
     head = head->Next();
   }


@@ -125,6 +128,7 @@ 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)
       return FALSE;
     int pos = line.Find(':');
     if (pos == -1)
       return FALSE;


@@ -160,7 +164,7 @@ bool wxHTTP::Connect(const wxString& host)
     return FALSE;
   }
 
     return FALSE;
   }
 

-  if (!addr->Service("http"))
+  if (!addr->Service(_T("http")))

     addr->Service(80);
 
   return TRUE;
     addr->Service(80);
 
   return TRUE;


@@ -183,6 +187,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
   char *tmp_buf;
   char buf[HTTP_BSIZE];
 {
   char *tmp_buf;
   char buf[HTTP_BSIZE];

+  const wxWX2MBbuf pathbuf = path.mb_str();

 
   switch (req) {
   case wxHTTP_GET:
 
   switch (req) {
   case wxHTTP_GET:


@@ -192,7 +197,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     return FALSE;
   }
 
     return FALSE;
   }
 

-  sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char *)path);
+  SaveState();
+  Notify(FALSE);
+  SetFlags(WAITALL);
+
+  sprintf(buf, "%s %s HTTP/1.0\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");


@@ -201,37 +210,47 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   wxString tmp_str;
 
   m_error = GetLine(this, tmp_str);
   wxString tmp_str;
 
   m_error = GetLine(this, tmp_str);

-  if (m_error != wxPROTO_NOERR)
+  if (m_error != wxPROTO_NOERR) {
+    RestoreState();

     return FALSE;
     return FALSE;

+  }

 
 

-  if (!tmp_str.Contains("HTTP/")) {
+  if (!tmp_str.Contains(_T("HTTP/"))) {

     // TODO: support HTTP v0.9 which can have no header.
     // 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;
   }
 
     return TRUE;
   }
 

-  wxStringTokenizer token(tmp_str,' ');
+  wxStringTokenizer token(tmp_str,_T(' '));

   wxString tmp_str2;
   wxString tmp_str2;

+  bool ret_value;

 
   token.NextToken();
   tmp_str2 = token.NextToken();
 
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 

-  switch (atoi(tmp_str2)) {
+  switch (wxAtoi(tmp_str2)) {

   case 200:
     break;
   default:
     m_error = wxPROTO_NOFILE;
   case 200:
     break;
   default:
     m_error = wxPROTO_NOFILE;

+    RestoreState();

     return FALSE;
   }
 
     return FALSE;
   }
 

-  return ParseHeaders();
+  ret_value = ParseHeaders();
+  RestoreState();
+  return ret_value;

 }
 
 class wxHTTPStream : public wxSocketInputStream {
 public:
   wxHTTP *m_http;
 }
 
 class wxHTTPStream : public wxSocketInputStream {
 public:
   wxHTTP *m_http;

+  size_t m_httpsize;
+

   wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
   wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}

+  size_t StreamSize() const { return m_httpsize; }

   virtual ~wxHTTPStream(void) { m_http->Abort(); }
 };
 
   virtual ~wxHTTPStream(void) { m_http->Abort(); }
 };
 


@@ -255,5 +274,12 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 

+  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")));
+

   return inp_stream;
 }
   return inp_stream;
 }

+
+#endif
+   // wxUSE_SOCKETS