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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index c35d41b002..0853234490 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,6 +49,13 @@ wxHTTP::wxHTTP()
 }
 
 wxHTTP::~wxHTTP()
+{
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()
 {
   // wxString isn't a wxObject
   wxNode *node = m_headers.First();
@@ -60,10 +67,7 @@ wxHTTP::~wxHTTP()
     node = node->Next();
   }
 
-  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;
   }
 
@@ -116,7 +120,7 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
 
     wxString buf;
-    buf.Printf(wxT("%s: %s\n\r"), head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
@@ -130,7 +134,7 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
-  m_headers.Clear();
+  ClearHeaders();
   m_read = TRUE;
 
 #if defined(__VISAGECPP__)
@@ -147,8 +151,8 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
-	wxString left_str = line.BeforeFirst(':');
-	wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
+    wxString left_str = line.BeforeFirst(':');
+    wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
     left_str.MakeUpper();
 
     m_headers.Append(left_str, (wxObject *) str);
@@ -178,6 +182,8 @@ bool wxHTTP::Connect(const wxString& host)
   if (!addr->Service(wxT("http")))
     addr->Service(80);
 
+  SetHeader(wxT("Host"), host);
+
   return TRUE;
 }
 
@@ -185,42 +191,46 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   if (m_addr) {
     delete m_addr;
-    m_addr = NULL;
     Close();
   }
 
-  m_addr = (wxSockAddress *) addr.Clone();
+  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;
-  wxChar buf[200]; // 200 is arbitrary.
-  wxString tmp_str = path;
-
-  // If there is no User-Agent defined, define it.
-  if (GetHeader(wxT("User-Agent")).IsNull())
-    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
+  const wxChar *request;
 
   switch (req) {
   case wxHTTP_GET:
-    tmp_buf = wxT("GET");
+    request = wxT("GET");
     break;
   default:
     return FALSE;
   }
 
+  // If there is no User-Agent defined, define it.
+  if (GetHeader(wxT("User-Agent")).IsNull())
+    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
+
   SaveState();
-  SetFlags(NONE);
+  SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 
-  wxSprintf(buf, wxT("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
+  wxString buf;
+  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
-  Write("\n\r", 2);
+  Write("\r\n", 2);
 
+  wxString tmp_str;
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();
@@ -243,7 +253,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   token.NextToken();
   tmp_str2 = token.NextToken();
 
-  switch (tmp_str2[(unsigned int) 0]) {
+  switch (tmp_str2[0u]) {
   case wxT('1'):
     /* INFORMATION / SUCCESS */
     break;
@@ -299,7 +309,8 @@ bool wxHTTP::Abort(void)
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
-  wxHTTPStream *inp_stream = new wxHTTPStream(this);
+  wxHTTPStream *inp_stream;
+
   wxString new_path;
 
   m_perr = wxPROTO_CONNERR;
@@ -307,12 +318,22 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     return NULL;
 
   // We set m_connected back to FALSE so wxSocketBase will know what to do.
+#ifdef __WXMAC__
+        wxSocketClient::Connect(*m_addr , FALSE );
+        wxSocketClient::WaitOnConnect(10);
+
+    if (!wxSocketClient::IsConnected())
+        return NULL;
+#else
   if (!wxProtocol::Connect(*m_addr))
     return NULL;
+#endif
 
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 
+  inp_stream = new wxHTTPStream(this);
+
   if (!GetHeader(wxT("Content-Length")).IsEmpty())
     inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length")));
   else
@@ -326,5 +347,5 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   return inp_stream;
 }
 
-#endif
-   // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+