copyright update

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index d147823f1572fe0974f3f7b572f045886ac37f8d..55b44ed76d61747dbd706fd3035c77e827eab319 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__)


@@ -147,8 +151,8 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
     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);
     left_str.MakeUpper();
 
     m_headers.Append(left_str, (wxObject *) str);


@@ -177,6 +181,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;
 }


@@ -185,23 +191,21 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   if (m_addr) {
     delete m_addr;
 {
   if (m_addr) {
     delete m_addr;

-    m_addr = NULL;

     Close();
   }
 
     Close();
   }
 

-  m_addr = (wxSockAddress *) addr.Clone();
+  m_addr = addr.Clone();
+
+  wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
+  if (ipv4addr)
+      SetHeader(wxT("Host"), ipv4addr->Hostname());
+

   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
   wxChar *tmp_buf;
   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"));

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


@@ -211,16 +215,22 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     return FALSE;
   }
 
     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(wxSOCKET_NONE);
   Notify(FALSE);
 
   SaveState();
   SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 

-  wxSprintf(buf, wxT("%s %s HTTP/1.0\r\n"), tmp_buf, tmp_str.GetData());
+  wxString buf;
+  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), tmp_buf, path.c_str());

   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
 
   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
 

+  wxString tmp_str;

   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();
   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();
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 

-  switch (tmp_str2[(unsigned int) 0]) {
+  switch (tmp_str2[0u]) {

   case wxT('1'):
     /* INFORMATION / SUCCESS */
     break;
   case wxT('1'):
     /* INFORMATION / SUCCESS */
     break;


@@ -308,8 +318,16 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     return NULL;
 
   // We set m_connected back to FALSE so wxSocketBase will know what to do.
     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;
   if (!wxProtocol::Connect(*m_addr))
     return NULL;

+#endif

 
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;


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

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