added wxVaCopy() and use it to fix wxVsnprintf() crash (see bug 1017651)

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index b98d6c83af9c3a6dae459c1a4c3bf2b7d66607f7..990e08e276729ae20cb70d06dc5e8e1f7c481a94 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -6,10 +6,10 @@
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "http.h"
 #endif
 
   #pragma implementation "http.h"
 #endif
 


@@ -33,17 +33,18 @@
 #include "wx/sckstrm.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 #include "wx/sckstrm.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)

-IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
+IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)

 
 #define HTTP_BSIZE 2048
 
 wxHTTP::wxHTTP()
 
 #define HTTP_BSIZE 2048
 
 wxHTTP::wxHTTP()

-  : wxProtocol(),
-    m_headers(wxKEY_STRING)
+  : wxProtocol()

 {
   m_addr = NULL;
 {
   m_addr = NULL;

-  m_read = FALSE;
-  m_proxy_mode = FALSE;
+  m_read = false;
+  m_proxy_mode = false;
+  m_post_buf = wxEmptyString;
+  m_http_response = 0;

 
   SetNotify(wxSOCKET_LOST_FLAG);
 }
 
   SetNotify(wxSOCKET_LOST_FLAG);
 }


@@ -57,17 +58,7 @@ wxHTTP::~wxHTTP()
 
 void wxHTTP::ClearHeaders()
 {
 
 void wxHTTP::ClearHeaders()
 {

-  // wxString isn't a wxObject
-  wxNode *node = m_headers.First();
-  wxString *string;
-
-  while (node) {
-    string = (wxString *)node->Data();
-    delete string;
-    node = node->Next();
-  }
-
-  m_headers.Clear();
+  m_headers.clear();

 }
 
 wxString wxHTTP::GetContentType()
 }
 
 wxString wxHTTP::GetContentType()


@@ -80,52 +71,67 @@ void wxHTTP::SetProxyMode(bool on)
   m_proxy_mode = on;
 }
 
   m_proxy_mode = on;
 }
 

+wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header)
+{
+    wxHeaderIterator it = m_headers.begin();
+    for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
+    {
+        if ( wxStricmp(it->first, header) == 0 )
+            break;
+    }
+
+    return it;
+}
+
+wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const
+{
+    wxHeaderConstIterator it = m_headers.begin();
+    for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it )
+    {
+        if ( wxStricmp(it->first, header) == 0 )
+            break;
+    }
+
+    return it;
+}
+

 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
     ClearHeaders();
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
     ClearHeaders();

-    m_read = FALSE;
+    m_read = false;

   }
 
   }
 

-  wxNode *node = m_headers.Find(header);
-
-  if (!node)
-    m_headers.Append(header, (wxObject *)(new wxString(h_data)));
-  else {
-    wxString *str = (wxString *)node->Data();
-    (*str) = h_data;
-  }
+  wxHeaderIterator it = FindHeader(header);
+  if (it != m_headers.end())
+    it->second = h_data;
+  else
+    m_headers[header] = h_data;

 }
 
 }
 

-wxString wxHTTP::GetHeader(const wxString& header)
+wxString wxHTTP::GetHeader(const wxString& header) const

 {
 {

-  wxNode *node;
-  wxString upper_header;
-
-  upper_header = header.Upper();
+    wxHeaderConstIterator it = FindHeader(header);

 
 

-  node = m_headers.Find(upper_header);
-  if (!node)
-    return wxEmptyString;
+    return it == m_headers.end() ? wxGetEmptyString() : it->second;
+}

 
 

-  return *((wxString *)node->Data());
+void wxHTTP::SetPostBuffer(const wxString& post_buf)
+{
+    m_post_buf = post_buf;

 }
 
 void wxHTTP::SendHeaders()
 {
 }
 
 void wxHTTP::SendHeaders()
 {

-  wxNode *head = m_headers.First();
+  typedef wxStringToStringHashMap::iterator iterator;
+  wxString buf;

 
 

-  while (head)
+  for (iterator it = m_headers.begin(), en = m_headers.end(); it != en; ++it )

   {
   {

-    wxString *str = (wxString *)head->Data();
-
-    wxString buf;
-    buf.Printf(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\r\n"), it->first.c_str(), it->second.c_str());

 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));

-
-    head = head->Next();

   }
 }
 
   }
 }
 


@@ -135,32 +141,30 @@ bool wxHTTP::ParseHeaders()
   wxStringTokenizer tokenzr;
 
   ClearHeaders();
   wxStringTokenizer tokenzr;
 
   ClearHeaders();

-  m_read = TRUE;
+  m_read = true;

 
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)
 
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)

-    bool bOs2var = TRUE;
-    while(bOs2var) {
+    bool bOs2var = true;
+    while(bOs2var)

 #else
 #else

-    while (1) {
+  while (1)

 #endif
 #endif

+  {

     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)

-      return FALSE;
+      return false;

 
     if (line.Length() == 0)
       break;
 
     wxString left_str = line.BeforeFirst(':');
 
     if (line.Length() == 0)
       break;
 
     wxString left_str = line.BeforeFirst(':');

-    wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
-    left_str.MakeUpper();
-
-    m_headers.Append(left_str, (wxObject *) str);
+    m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);

   }
   }

-  return TRUE;
+  return true;

 }
 
 }
 

-bool wxHTTP::Connect(const wxString& host)
+bool wxHTTP::Connect(const wxString& host, unsigned short port)

 {
   wxIPV4address *addr;
 
 {
   wxIPV4address *addr;
 


@@ -176,15 +180,16 @@ bool wxHTTP::Connect(const wxString& host)
     delete m_addr;
     m_addr = NULL;
     m_perr = wxPROTO_NETERR;
     delete m_addr;
     m_addr = NULL;
     m_perr = wxPROTO_NETERR;

-    return FALSE;
+    return false;

   }
 
   }
 

-  if (!addr->Service(wxT("http")))
+  if ( port ) addr->Service(port);
+  else if (!addr->Service(wxT("http")))

     addr->Service(80);
     addr->Service(80);

-    
+

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

-  return TRUE;
+  return true;

 }
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 }
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))


@@ -198,9 +203,9 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 
   wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
   if (ipv4addr)
 
   wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
   if (ipv4addr)

-      SetHeader(wxT("Host"), ipv4addr->Hostname());
+      SetHeader(wxT("Host"), ipv4addr->OrigHostname());

 
 

-  return TRUE;
+  return true;

 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)


@@ -211,30 +216,46 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   case wxHTTP_GET:
     request = wxT("GET");
     break;
   case wxHTTP_GET:
     request = wxT("GET");
     break;

+  case wxHTTP_POST:
+    request = wxT("POST");
+    if ( GetHeader( wxT("Content-Length") ).IsNull() )
+      SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
+    break;

   default:
   default:

-    return FALSE;
+    return false;

   }
 
   }
 

+  m_http_response = 0;
+

   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())
   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())

-    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
+    SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));

 
   SaveState();
 
   SaveState();

-  SetFlags(wxSOCKET_NONE);
-  Notify(FALSE);
+#if wxUSE_THREADS
+  SetFlags( wxThread::IsMain() ? wxSOCKET_NONE : wxSOCKET_BLOCK );
+#else
+  SetFlags( wxSOCKET_NONE );
+#endif
+  Notify(false);

 
   wxString buf;
   buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
 
   wxString buf;
   buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());

-  const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
+  const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf);

   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
 
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
 

+  if ( req == wxHTTP_POST ) {
+    Write(m_post_buf.mbc_str(), m_post_buf.Len());
+    m_post_buf = wxEmptyString;
+  }
+

   wxString tmp_str;
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();
   wxString tmp_str;
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();

-    return FALSE;
+    return false;

   }
 
   if (!tmp_str.Contains(wxT("HTTP/"))) {
   }
 
   if (!tmp_str.Contains(wxT("HTTP/"))) {


@@ -243,7 +264,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     SetHeader(wxT("Content-Length"), wxT("-1"));
     SetHeader(wxT("Content-Type"), wxT("none/none"));
     RestoreState();
     SetHeader(wxT("Content-Length"), wxT("-1"));
     SetHeader(wxT("Content-Type"), wxT("none/none"));
     RestoreState();

-    return TRUE;
+    return true;

   }
 
   wxStringTokenizer token(tmp_str,wxT(' '));
   }
 
   wxStringTokenizer token(tmp_str,wxT(' '));


@@ -253,6 +274,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   token.NextToken();
   tmp_str2 = token.NextToken();
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 

+  m_http_response = wxAtoi(tmp_str2);
+

   switch (tmp_str2[0u]) {
   case wxT('1'):
     /* INFORMATION / SUCCESS */
   switch (tmp_str2[0u]) {
   case wxT('1'):
     /* INFORMATION / SUCCESS */


@@ -266,7 +289,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   default:
     m_perr = wxPROTO_NOFILE;
     RestoreState();
   default:
     m_perr = wxPROTO_NOFILE;
     RestoreState();

-    return FALSE;
+    return false;

   }
 
   ret_value = ParseHeaders();
   }
 
   ret_value = ParseHeaders();


@@ -287,19 +310,22 @@ public:
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);

+
+    DECLARE_NO_COPY_CLASS(wxHTTPStream)

 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {
 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {

-  size_t ret;
-
-  if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
-    return 0;
+    if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }

 
 

-  ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
-  m_read_bytes += ret;
+    size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
+    m_read_bytes += ret;

 
 

-  return ret;
+    return ret;

 }
 
 bool wxHTTP::Abort(void)
 }
 
 bool wxHTTP::Abort(void)


@@ -317,9 +343,9 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!m_addr)
     return NULL;
 
   if (!m_addr)
     return NULL;
 

-  // We set m_connected back to FALSE so wxSocketBase will know what to do.
+  // We set m_connected back to false so wxSocketBase will know what to do.

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-        wxSocketClient::Connect(*m_addr , FALSE );
+        wxSocketClient::Connect(*m_addr , false );

         wxSocketClient::WaitOnConnect(10);
 
     if (!wxSocketClient::IsConnected())
         wxSocketClient::WaitOnConnect(10);
 
     if (!wxSocketClient::IsConnected())


@@ -329,7 +355,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     return NULL;
 #endif
 
     return NULL;
 #endif
 

-  if (!BuildRequest(path, wxHTTP_GET))
+  if (!BuildRequest(path, m_post_buf.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))

     return NULL;
 
   inp_stream = new wxHTTPStream(this);
     return NULL;
 
   inp_stream = new wxHTTPStream(this);


@@ -341,7 +367,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 
   inp_stream->m_read_bytes = 0;
 
 
   inp_stream->m_read_bytes = 0;
 

-  Notify(FALSE);
+  Notify(false);

   SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
   return inp_stream;
   SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
   return inp_stream;