Check that an error really occurred when getting wxChoice data in wxMSW.

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index fc7248f61a8e0d685e67f6732dfc5209e81dd09d..49f08f6dfb55e5702cc261a4ec06f376da5b1eae 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -34,6 +34,11 @@
 #include "wx/sckstrm.h"
 #include "wx/thread.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)
 


@@ -43,7 +48,6 @@ wxHTTP::wxHTTP()
     m_addr = NULL;
     m_read = false;
     m_proxy_mode = false;
     m_addr = NULL;
     m_read = false;
     m_proxy_mode = false;

-    m_post_buf = wxEmptyString;

     m_http_response = 0;
 
     SetNotify(wxSOCKET_LOST_FLAG);
     m_http_response = 0;
 
     SetNotify(wxSOCKET_LOST_FLAG);


@@ -58,10 +62,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"));
 }


@@ -95,6 +104,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) {


@@ -116,8 +149,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;


@@ -150,7 +192,41 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass)
 
 void wxHTTP::SetPostBuffer(const wxString& post_buf)
 {
 
 void wxHTTP::SetPostBuffer(const wxString& post_buf)
 {

-    m_post_buf = post_buf;
+    // Use To8BitData() for backwards compatibility in this deprecated method.
+    // The new code should use the other overload or SetPostText() and specify
+    // the encoding to use for the text explicitly.
+    wxScopedCharBuffer scb = post_buf.To8BitData();
+    if ( scb.length() )
+    {
+        m_postBuffer.Clear();
+        m_postBuffer.AppendData(scb.data(), scb.length());
+    }
+}
+
+bool
+wxHTTP::SetPostBuffer(const wxString& contentType,
+                      const wxMemoryBuffer& data)
+{
+    m_postBuffer = data;
+    m_contentType = contentType;
+
+    return !m_postBuffer.IsEmpty();
+}
+
+bool
+wxHTTP::SetPostText(const wxString& contentType,
+                    const wxString& data,
+                    const wxMBConv& conv)
+{
+    wxScopedCharBuffer scb = data.mb_str(conv);
+    if ( !scb.length() )
+        return false;
+
+    m_postBuffer.Clear();
+    m_postBuffer.AppendData(scb.data(), scb.length());
+    m_contentType = contentType;
+
+    return true;

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


@@ -173,19 +249,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;
 }


@@ -195,17 +284,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;
     }
 


@@ -214,12 +301,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;


@@ -229,9 +320,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;
 }
 


@@ -247,8 +345,21 @@ 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() )
-                SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
+            // Content length must be correct, so always set, possibly
+            // overriding the value set explicitly by a previous call to
+            // SetHeader("Content-Length").
+            if ( !m_postBuffer.IsEmpty() )
+            {
+                wxString len;
+                len << m_postBuffer.GetDataLen();
+
+                SetHeader(wxS("Content-Length"), len);
+            }
+
+            // However if the user had explicitly set the content type, don't
+            // override it with the content type passed to SetPostText().
+            if ( !m_contentType.empty() && GetContentType().empty() )
+                SetHeader(wxS("Content-Type"), m_contentType);

             break;
 
         default:
             break;
 
         default:


@@ -258,7 +369,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


@@ -281,13 +392,15 @@ 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());
-        m_post_buf = wxEmptyString;
+        if ( !m_postBuffer.IsEmpty() )
+            Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen());
+
+        m_postBuffer.Clear();

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


@@ -295,6 +408,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();


@@ -325,16 +439,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:


@@ -349,12 +473,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;


@@ -369,24 +493,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;
 


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

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

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


@@ -417,6 +536,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;
 }