Generate EVT_SPINCTRL_UPDATED for wxMotif, too

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 8471c3392646dbc820b88446f72a75b0ddf436ae..085323449051120ac128370645794b78f234891e 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_HTTP

 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


@@ -49,6 +49,13 @@ wxHTTP::wxHTTP()
 }
 
 wxHTTP::~wxHTTP()
 }
 
 wxHTTP::~wxHTTP()

+{
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()

 {
   // wxString isn't a wxObject
   wxNode *node = m_headers.First();
 {
   // wxString isn't a wxObject
   wxNode *node = m_headers.First();


@@ -60,10 +67,7 @@ wxHTTP::~wxHTTP()
     node = node->Next();
   }
 
     node = node->Next();
   }
 

-  if (m_addr) {
-      delete m_addr;
-      m_addr = NULL;
-  }
+  m_headers.Clear();

 }
 
 wxString wxHTTP::GetContentType()
 }
 
 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) {
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {

-    m_headers.Clear();
+    ClearHeaders();

     m_read = FALSE;
   }
 
     m_read = FALSE;
   }
 


@@ -130,7 +134,7 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
   wxString line;
   wxStringTokenizer tokenzr;
 

-  m_headers.Clear();
+  ClearHeaders();

   m_read = TRUE;
 
 #if defined(__VISAGECPP__)
   m_read = TRUE;
 
 #if defined(__VISAGECPP__)


@@ -178,6 +182,8 @@ bool wxHTTP::Connect(const wxString& host)
   if (!addr->Service(wxT("http")))
     addr->Service(80);
 
   if (!addr->Service(wxT("http")))
     addr->Service(80);
 

+  SetHeader(wxT("Host"), host);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -190,16 +196,20 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 
   m_addr = 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)
 {
   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {

-  wxChar *tmp_buf;
+  const wxChar *request;

 
   switch (req) {
   case wxHTTP_GET:
 
   switch (req) {
   case wxHTTP_GET:

-    tmp_buf = wxT("GET");
+    request = wxT("GET");

     break;
   default:
     return FALSE;
     break;
   default:
     return FALSE;


@@ -214,7 +224,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   Notify(FALSE);
 
   wxString buf;
   Notify(FALSE);
 
   wxString buf;

-  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), tmp_buf, path.c_str());
+  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();
   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();


@@ -337,5 +347,5 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   return inp_stream;
 }
 
   return inp_stream;
 }
 

-#endif
-   // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+