X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/295272bdcd784fbe2b33883d00cff0f5c0ca5341..d546eba94e77831c41e3370484a41181517bd611:/src/common/http.cpp

diff --git a/src/common/http.cpp b/src/common/http.cpp
index b98d6c83af..346896925a 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -6,7 +6,7 @@
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -58,13 +58,13 @@ wxHTTP::~wxHTTP()
 void wxHTTP::ClearHeaders()
 {
   // wxString isn't a wxObject
-  wxNode *node = m_headers.First();
+  wxNode *node = m_headers.GetFirst();
   wxString *string;
 
   while (node) {
-    string = (wxString *)node->Data();
+    string = (wxString *)node->GetData();
     delete string;
-    node = node->Next();
+    node = node->GetNext();
   }
 
   m_headers.Clear();
@@ -90,9 +90,9 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
   wxNode *node = m_headers.Find(header);
 
   if (!node)
-    m_headers.Append(header, (wxObject *)(new wxString(h_data)));
+    m_headers.Append(header.Upper(), (wxObject *)(new wxString(h_data)));
   else {
-    wxString *str = (wxString *)node->Data();
+    wxString *str = (wxString *)node->GetData();
     (*str) = h_data;
   }
 }
@@ -108,16 +108,16 @@ wxString wxHTTP::GetHeader(const wxString& header)
   if (!node)
     return wxEmptyString;
 
-  return *((wxString *)node->Data());
+  return *((wxString *)node->GetData());
 }
 
 void wxHTTP::SendHeaders()
 {
-  wxNode *head = m_headers.First();
+  wxNode *head = m_headers.GetFirst();
 
   while (head)
   {
-    wxString *str = (wxString *)head->Data();
+    wxString *str = (wxString *)head->GetData();
 
     wxString buf;
     buf.Printf(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());
@@ -125,7 +125,7 @@ void wxHTTP::SendHeaders()
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 
-    head = head->Next();
+    head = head->GetNext();
   }
 }
 
@@ -181,7 +181,7 @@ bool wxHTTP::Connect(const wxString& host)
 
   if (!addr->Service(wxT("http")))
     addr->Service(80);
-    
+
   SetHeader(wxT("Host"), host);
 
   return TRUE;
@@ -198,7 +198,7 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 
   wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
   if (ipv4addr)
-      SetHeader(wxT("Host"), ipv4addr->Hostname());
+      SetHeader(wxT("Host"), ipv4addr->OrigHostname());
 
   return TRUE;
 }
@@ -225,7 +225,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
   wxString buf;
   buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
-  const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
+  const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
@@ -287,19 +287,22 @@ public:
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxHTTPStream)
 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {
-  size_t ret;
-
-  if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
-    return 0;
+    if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }
 
-  ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
-  m_read_bytes += ret;
+    size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
+    m_read_bytes += ret;
 
-  return ret;
+    return ret;
 }
 
 bool wxHTTP::Abort(void)