Initial work on virtual file system support for the WebKitGTK+ backend. It now suppor...

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index f8977ecedffbf4188ad68b02ff431eba1e476605..e238364ece6c0d5fa72ac3609bae3f44ad5247e5 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -32,6 +32,12 @@
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"

+#include "wx/thread.h"
+
+
+// ----------------------------------------------------------------------------
+// wxHTTP
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)


@@ -57,10 +63,15 @@ wxHTTP::~wxHTTP()
 
 void wxHTTP::ClearHeaders()
 {
 
 void wxHTTP::ClearHeaders()
 {

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

 }
 
 }
 

-wxString wxHTTP::GetContentType()
+wxString wxHTTP::GetContentType() const

 {
     return GetHeader(wxT("Content-Type"));
 }
 {
     return GetHeader(wxT("Content-Type"));
 }


@@ -75,7 +86,7 @@ wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header)
     wxHeaderIterator it = m_headers.begin();
     for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
     {
     wxHeaderIterator it = m_headers.begin();
     for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
     {

-        if ( wxStricmp(it->first, header) == 0 )
+        if ( header.CmpNoCase(it->first) == 0 )

             break;
     }
 
             break;
     }
 


@@ -87,7 +98,31 @@ wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const
     wxHeaderConstIterator it = m_headers.begin();
     for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it )
     {
     wxHeaderConstIterator it = m_headers.begin();
     for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it )
     {

-        if ( wxStricmp(it->first, header) == 0 )
+        if ( header.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    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;
     }
 
             break;
     }
 


@@ -115,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;


@@ -172,19 +216,32 @@ bool wxHTTP::ParseHeaders()
     wxStringTokenizer tokenzr;
 
     ClearHeaders();
     wxStringTokenizer tokenzr;
 
     ClearHeaders();

+    ClearCookies();

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

-        m_perr = ReadLine(this, line);
-        if (m_perr != wxPROTO_NOERR)
+        m_lastError = ReadLine(this, line);
+        if (m_lastError != wxPROTO_NOERR)

             return false;
 
             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;
 }


@@ -194,17 +251,15 @@ 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;
-        m_perr = wxPROTO_NETERR;
+        wxDELETE(m_addr);
+        m_lastError = wxPROTO_NETERR;

         return false;
     }
 
         return false;
     }
 


@@ -213,12 +268,16 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
     else if (!addr->Service(wxT("http")))
         addr->Service(80);
 
     else if (!addr->Service(wxT("http")))
         addr->Service(80);
 

-    SetHeader(wxT("Host"), host);
+    wxString hostHdr = host;
+    if ( port && port != 80 )
+        hostHdr << wxT(":") << port;
+    SetHeader(wxT("Host"), hostHdr);

 
 

+    m_lastError = wxPROTO_NOERR;

     return true;
 }
 
     return true;
 }
 

-bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
+bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))

 {
     if (m_addr) {
         delete m_addr;
 {
     if (m_addr) {
         delete m_addr;


@@ -228,9 +287,16 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
     m_addr = addr.Clone();
 
     wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
     m_addr = addr.Clone();
 
     wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);

-    if (ipv4addr)
-        SetHeader(wxT("Host"), ipv4addr->OrigHostname());
+    if ( ipv4addr )
+    {
+        wxString hostHdr = ipv4addr->OrigHostname();
+        unsigned short port = ipv4addr->Service();
+        if ( port && port != 80 )
+            hostHdr << wxT(":") << port;
+        SetHeader(wxT("Host"), hostHdr);
+    }

 
 

+    m_lastError = wxPROTO_NOERR;

     return true;
 }
 
     return true;
 }
 


@@ -246,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;
 


@@ -257,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


@@ -274,19 +340,29 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
     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 = wxConvLocal.cWX2MB(buf);
-    Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
+    const wxWX2MBbuf pathbuf = buf.mb_str();
+    Write(pathbuf, strlen(pathbuf));

     SendHeaders();
     Write("\r\n", 2);
 
     if ( req == wxHTTP_POST ) {
     SendHeaders();
     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;
     }
 
     wxString tmp_str;
         m_post_buf = wxEmptyString;
     }
 
     wxString tmp_str;

-    m_perr = ReadLine(this, tmp_str);
-    if (m_perr != wxPROTO_NOERR) {
+    m_lastError = ReadLine(this, tmp_str);
+    if (m_lastError != wxPROTO_NOERR) {

         RestoreState();
         return false;
     }
         RestoreState();
         return false;
     }


@@ -294,6 +370,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     if (!tmp_str.Contains(wxT("HTTP/"))) {
         // TODO: support HTTP v0.9 which can have no header.
         // FIXME: tmp_str is not put back in the in-queue of the socket.
     if (!tmp_str.Contains(wxT("HTTP/"))) {
         // TODO: support HTTP v0.9 which can have no header.
         // FIXME: tmp_str is not put back in the in-queue of the socket.

+        m_lastError = wxPROTO_NOERR;

         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();


@@ -324,16 +401,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
             break;
 
         default:
             break;
 
         default:

-            m_perr = wxPROTO_NOFILE;
+            m_lastError = wxPROTO_NOFILE;

             RestoreState();
             return false;
     }
 
             RestoreState();
             return false;
     }
 

+    m_lastError = wxPROTO_NOERR;

     ret_value = ParseHeaders();
     RestoreState();
     return ret_value;
 }
 
     ret_value = ParseHeaders();
     RestoreState();
     return ret_value;
 }
 

+bool wxHTTP::Abort(void)
+{
+    return wxSocketClient::Close();
+}
+
+// ----------------------------------------------------------------------------
+// wxHTTPStream and wxHTTP::GetInputStream
+// ----------------------------------------------------------------------------
+

 class wxHTTPStream : public wxSocketInputStream
 {
 public:
 class wxHTTPStream : public wxSocketInputStream
 {
 public:


@@ -348,12 +435,12 @@ public:
 protected:
     size_t OnSysRead(void *buffer, size_t bufsize);
 
 protected:
     size_t OnSysRead(void *buffer, size_t bufsize);
 

-    DECLARE_NO_COPY_CLASS(wxHTTPStream)
+    wxDECLARE_NO_COPY_CLASS(wxHTTPStream);

 };
 
 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;


@@ -368,24 +455,19 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
         // which is equivalent to getting a READ_ERROR, for clients however this
         // must be translated into EOF, as it is the expected way of signalling
         // end end of the content
         // which is equivalent to getting a READ_ERROR, for clients however this
         // must be translated into EOF, as it is the expected way of signalling
         // end end of the content

-        m_lasterror = wxSTREAM_EOF ;
+        m_lasterror = wxSTREAM_EOF;

     }
 
     return ret;
 }
 
     }
 
     return ret;
 }
 

-bool wxHTTP::Abort(void)
-{
-    return wxSocketClient::Close();
-}
-

 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
     wxHTTPStream *inp_stream;
 
     wxString new_path;
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
     wxHTTPStream *inp_stream;
 
     wxString new_path;
 

-    m_perr = wxPROTO_CONNERR;
+    m_lastError = wxPROTO_CONNERR;  // all following returns share this type of error

     if (!m_addr)
         return NULL;
 
     if (!m_addr)
         return NULL;
 


@@ -407,7 +489,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     inp_stream = new wxHTTPStream(this);
 
     if (!GetHeader(wxT("Content-Length")).empty())
     inp_stream = new wxHTTPStream(this);
 
     if (!GetHeader(wxT("Content-Length")).empty())

-        inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length")));
+        inp_stream->m_httpsize = wxAtoi(GetHeader(wxT("Content-Length")));

     else
         inp_stream->m_httpsize = (size_t)-1;
 
     else
         inp_stream->m_httpsize = (size_t)-1;
 


@@ -416,6 +498,8 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     Notify(false);
     SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
     Notify(false);
     SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 

+    // no error; reset m_lastError
+    m_lastError = wxPROTO_NOERR;

     return inp_stream;
 }
 
     return inp_stream;
 }