Applied patch [ 601072 ] wxFileName::GetLongPath error & fix

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index bda7c28d0032749d5c33ba8d0ea31f15d5c32f24..eca6160a5e13065315e9ff4034afcb0d6cabef05 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -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;
   }
 
@@ -130,7 +134,7 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
-  m_headers.Clear();
+  ClearHeaders();
   m_read = TRUE;
 
 #if defined(__VISAGECPP__)
@@ -177,7 +181,7 @@ bool wxHTTP::Connect(const wxString& host)
 
   if (!addr->Service(wxT("http")))
     addr->Service(80);
-    
+
   SetHeader(wxT("Host"), host);
 
   return TRUE;
@@ -194,18 +198,18 @@ 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;
 }
 
 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;
@@ -220,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);