X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acd15a3fa015caf2d1e3213a7694b05c92d5b49c..c5c04fabb02c27bcc8115bff024d74ddd48f8175:/src/common/http.cpp

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 8471c33926..71bb8ea430 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__
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_HTTP
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,21 +49,25 @@ wxHTTP::wxHTTP()
 }
 
 wxHTTP::~wxHTTP()
+{
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+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();
   }
 
-  if (m_addr) {
-      delete m_addr;
-      m_addr = NULL;
-  }
+  m_headers.Clear();
 }
 
 wxString wxHTTP::GetContentType()
@@ -79,7 +83,7 @@ void wxHTTP::SetProxyMode(bool on)
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
-    m_headers.Clear();
+    ClearHeaders();
     m_read = FALSE;
   }
 
@@ -88,7 +92,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
   if (!node)
     m_headers.Append(header, (wxObject *)(new wxString(h_data)));
   else {
-    wxString *str = (wxString *)node->Data();
+    wxString *str = (wxString *)node->GetData();
     (*str) = h_data;
   }
 }
@@ -104,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());
@@ -121,7 +125,7 @@ void wxHTTP::SendHeaders()
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 
-    head = head->Next();
+    head = head->GetNext();
   }
 }
 
@@ -130,7 +134,7 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
-  m_headers.Clear();
+  ClearHeaders();
   m_read = TRUE;
 
 #if defined(__VISAGECPP__)
@@ -178,6 +182,8 @@ bool wxHTTP::Connect(const wxString& host)
   if (!addr->Service(wxT("http")))
     addr->Service(80);
 
+  SetHeader(wxT("Host"), host);
+
   return TRUE;
 }
 
@@ -190,16 +196,20 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 
   m_addr = addr.Clone();
 
+  wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
+  if (ipv4addr)
+      SetHeader(wxT("Host"), ipv4addr->OrigHostname());
+
   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
-  wxChar *tmp_buf;
+  const wxChar *request;
 
   switch (req) {
   case wxHTTP_GET:
-    tmp_buf = wxT("GET");
+    request = wxT("GET");
     break;
   default:
     return FALSE;
@@ -214,8 +224,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   Notify(FALSE);
 
   wxString buf;
-  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), tmp_buf, path.c_str());
-  const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
+  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
+  const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
@@ -277,6 +287,8 @@ public:
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxHTTPStream)
 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
@@ -337,5 +349,5 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   return inp_stream;
 }
 
-#endif
-   // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+