X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..f5ba273ecd799f652736ce2bc830283787302a56:/src/common/http.cpp

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 9f7e3adabc..606bc340ec 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -32,10 +32,8 @@
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
-#endif
 
 #define HTTP_BSIZE 2048
 
@@ -47,7 +45,7 @@ wxHTTP::wxHTTP()
   m_read = FALSE;
   m_proxy_mode = FALSE;
 
-  SetNotify(GSOCK_LOST_FLAG);
+  SetNotify(wxSOCKET_LOST_FLAG);
 }
 
 wxHTTP::~wxHTTP()
@@ -61,6 +59,11 @@ wxHTTP::~wxHTTP()
     delete string;
     node = node->Next();
   }
+
+  if (m_addr) {
+      delete m_addr;
+      m_addr = NULL;
+  }
 }
 
 wxString wxHTTP::GetContentType()
@@ -96,7 +99,7 @@ wxString wxHTTP::GetHeader(const wxString& header)
   wxString upper_header;
 
   upper_header = header.Upper();
-  
+
   node = m_headers.Find(upper_header);
   if (!node)
     return wxEmptyString;
@@ -130,7 +133,13 @@ bool wxHTTP::ParseHeaders()
   m_headers.Clear();
   m_read = TRUE;
 
-  while (1) {
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1)
+    bool bOs2var = TRUE;
+    while(bOs2var) {
+#else
+    while (1) {
+#endif
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;
@@ -138,13 +147,8 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
-    tokenzr.SetString(line, " :\t\n\r");
-    if (!tokenzr.HasMoreTokens())
-      return FALSE;
-
-    wxString left_str = tokenzr.GetNextToken();
-    wxString *str = new wxString(tokenzr.GetNextToken());
-
+	wxString left_str = line.BeforeFirst(':');
+	wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
     left_str.MakeUpper();
 
     m_headers.Append(left_str, (wxObject *) str);
@@ -197,7 +201,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())
-    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); 
+    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
 
   switch (req) {
   case wxHTTP_GET:
@@ -208,7 +212,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   }
 
   SaveState();
-  SetFlags(NONE);
+  SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 
   wxSprintf(buf, wxT("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
@@ -260,7 +264,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   return ret_value;
 }
 
-class wxHTTPStream : public wxSocketInputStream {
+class wxHTTPStream : public wxSocketInputStream
+{
 public:
   wxHTTP *m_http;
   size_t m_httpsize;
@@ -289,11 +294,7 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 
 bool wxHTTP::Abort(void)
 {
-  bool ret;
-
-  ret = wxSocketClient::Close();
-
-  return ret;
+  return wxSocketClient::Close();
 }
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
@@ -320,7 +321,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   inp_stream->m_read_bytes = 0;
 
   Notify(FALSE);
-  SetFlags(SPEED | WAITALL);
+  SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
   return inp_stream;
 }