Merge in from trunk r64802 - r68625

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 145ec61f3c8e2ae950ae924cf8524f5629162b60..e238364ece6c0d5fa72ac3609bae3f44ad5247e5 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -66,6 +66,11 @@ void wxHTTP::ClearHeaders()
     m_headers.clear();
 }
 
     m_headers.clear();
 }
 

+void wxHTTP::ClearCookies()
+{
+    m_cookies.clear();
+}
+

 wxString wxHTTP::GetContentType() const
 {
     return GetHeader(wxT("Content-Type"));
 wxString wxHTTP::GetContentType() const
 {
     return GetHeader(wxT("Content-Type"));


@@ -100,6 +105,30 @@ wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const
     return it;
 }
 
     return it;
 }
 

+wxHTTP::wxCookieIterator wxHTTP::FindCookie(const wxString& cookie)
+{
+    wxCookieIterator it = m_cookies.begin();
+    for ( wxCookieIterator en = m_cookies.end(); it != en; ++it )
+    {
+        if ( cookie.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    return it;
+}
+
+wxHTTP::wxCookieConstIterator wxHTTP::FindCookie(const wxString& cookie) const
+{
+    wxCookieConstIterator it = m_cookies.begin();
+    for ( wxCookieConstIterator en = m_cookies.end(); it != en; ++it )
+    {
+        if ( cookie.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    return it;
+}
+

 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) {


@@ -121,8 +150,17 @@ wxString wxHTTP::GetHeader(const wxString& header) const
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 

+wxString wxHTTP::GetCookie(const wxString& cookie) const
+{
+    wxCookieConstIterator it = FindCookie(cookie);
+
+    return it == m_cookies.end() ? wxGetEmptyString() : it->second;
+}
+

 wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const
 {
 wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const
 {

+    // TODO: Use wxBase64Encode() now that we have it instead of reproducing it
+

     static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     wxString buf;
     static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     wxString buf;


@@ -178,6 +216,7 @@ bool wxHTTP::ParseHeaders()
     wxStringTokenizer tokenzr;
 
     ClearHeaders();
     wxStringTokenizer tokenzr;
 
     ClearHeaders();

+    ClearCookies();

     m_read = true;
 
     for ( ;; )
     m_read = true;
 
     for ( ;; )


@@ -186,11 +225,23 @@ bool wxHTTP::ParseHeaders()
         if (m_lastError != wxPROTO_NOERR)
             return false;
 
         if (m_lastError != wxPROTO_NOERR)
             return false;
 

-        if (line.length() == 0)
+        if ( line.empty() )

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

-        m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
+        if(!left_str.CmpNoCase("Set-Cookie"))
+        {
+            wxString cookieName = line.AfterFirst(':').Strip(wxString::both).BeforeFirst('=');
+            wxString cookieValue = line.AfterFirst(':').Strip(wxString::both).AfterFirst('=').BeforeFirst(';');
+            m_cookies[cookieName] = cookieValue;
+
+            // For compatibility
+            m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
+        }
+        else
+        {
+            m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
+        }

     }
     return true;
 }
     }
     return true;
 }


@@ -200,16 +251,14 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
     wxIPV4address *addr;
 
     if (m_addr) {
     wxIPV4address *addr;
 
     if (m_addr) {

-        delete m_addr;
-        m_addr = NULL;
+        wxDELETE(m_addr);

         Close();
     }
 
     m_addr = addr = new wxIPV4address();
 
     if (!addr->Hostname(host)) {
         Close();
     }
 
     m_addr = addr = new wxIPV4address();
 
     if (!addr->Hostname(host)) {

-        delete m_addr;
-        m_addr = NULL;
+        wxDELETE(m_addr);

         m_lastError = wxPROTO_NETERR;
         return false;
     }
         m_lastError = wxPROTO_NETERR;
         return false;
     }


@@ -263,7 +312,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
         case wxHTTP_POST:
             request = wxT("POST");
 
         case wxHTTP_POST:
             request = wxT("POST");

-            if ( GetHeader( wxT("Content-Length") ).IsNull() )
+            if ( GetHeader( wxT("Content-Length") ).empty() )

                 SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
             break;
 
                 SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
             break;
 


@@ -274,7 +323,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     m_http_response = 0;
 
     // If there is no User-Agent defined, define it.
     m_http_response = 0;
 
     // If there is no User-Agent defined, define it.

-    if (GetHeader(wxT("User-Agent")).IsNull())
+    if ( GetHeader(wxT("User-Agent")).empty() )

         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
     // Send authentication information
         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
     // Send authentication information


@@ -297,7 +346,17 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     Write("\r\n", 2);
 
     if ( req == wxHTTP_POST ) {
     Write("\r\n", 2);
 
     if ( req == wxHTTP_POST ) {

-        Write(m_post_buf.mbc_str(), m_post_buf.Len());
+        // Post data can be arbitrary binary data when the "binary" content
+        // transfer encoding is used so don't assume it's ASCII only or
+        // NUL-terminated.
+        {
+            const wxScopedCharBuffer buf(m_post_buf.To8BitData());
+            Write(buf, buf.length());
+        } // delete the buffer before modifying the string it points to, it
+          // wouldn't really be a problem here even if we didn't do this
+          // because we won't use this buffer again but this will avoid any
+          // nasty surprises in the future if this code changes
+

         m_post_buf = wxEmptyString;
     }
 
         m_post_buf = wxEmptyString;
     }
 


@@ -381,7 +440,7 @@ protected:
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {

-    if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+    if (m_read_bytes >= m_httpsize)

     {
         m_lasterror = wxSTREAM_EOF;
         return 0;
     {
         m_lasterror = wxSTREAM_EOF;
         return 0;