X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/730b772b41ad9df76e5226290bb9eb917ea161f0..8fdbcf4de8eeff67ccfaf3deec833d203f112629:/src/common/http.cpp?ds=inline diff --git a/src/common/http.cpp b/src/common/http.cpp index da25a7828b..556618aca5 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -48,7 +48,6 @@ wxHTTP::wxHTTP() m_addr = NULL; m_read = false; m_proxy_mode = false; - m_post_buf = wxEmptyString; m_http_response = 0; SetNotify(wxSOCKET_LOST_FLAG); @@ -66,6 +65,11 @@ void wxHTTP::ClearHeaders() m_headers.clear(); } +void wxHTTP::ClearCookies() +{ + m_cookies.clear(); +} + wxString wxHTTP::GetContentType() const { return GetHeader(wxT("Content-Type")); @@ -100,6 +104,30 @@ wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const 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) { @@ -121,8 +149,17 @@ wxString wxHTTP::GetHeader(const wxString& header) const 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 { + // TODO: Use wxBase64Encode() now that we have it instead of reproducing it + static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; wxString buf; @@ -155,7 +192,49 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) 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) +{ +#if wxUSE_UNICODE + wxScopedCharBuffer scb = data.mb_str(conv); + const size_t len = scb.length(); + const char* const buf = scb.data(); +#else // !wxUSE_UNICODE + const size_t len = data.length(); + const char* const buf = data.mb_str(conv); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + + if ( !len ) + return false; + + m_postBuffer.Clear(); + m_postBuffer.AppendData(buf, len); + m_contentType = contentType; + + return true; } void wxHTTP::SendHeaders() @@ -178,6 +257,7 @@ bool wxHTTP::ParseHeaders() wxStringTokenizer tokenzr; ClearHeaders(); + ClearCookies(); m_read = true; for ( ;; ) @@ -186,11 +266,23 @@ bool wxHTTP::ParseHeaders() if (m_lastError != wxPROTO_NOERR) return false; - if (line.length() == 0) + if ( line.empty() ) 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; } @@ -200,16 +292,14 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) wxIPV4address *addr; if (m_addr) { - delete m_addr; - m_addr = NULL; + wxDELETE(m_addr); 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; } @@ -219,7 +309,10 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) 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; @@ -235,8 +328,14 @@ bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait)) 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; @@ -254,8 +353,21 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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: @@ -265,7 +377,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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 @@ -276,8 +388,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) SaveState(); // we may use non blocking sockets only if we can dispatch events from them - SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE - : wxSOCKET_BLOCK ); + int flags = wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE + : wxSOCKET_BLOCK; + // and we must use wxSOCKET_WAITALL to ensure that all data is sent + flags |= wxSOCKET_WAITALL; + SetFlags(flags); Notify(false); wxString buf; @@ -288,8 +403,10 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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; @@ -360,19 +477,25 @@ public: size_t m_httpsize; unsigned long m_read_bytes; - wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {} + wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http) + { + m_http = http; + m_httpsize = 0; + m_read_bytes = 0; + } + size_t GetSize() const { return m_httpsize; } virtual ~wxHTTPStream(void) { m_http->Abort(); } 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) { - if (m_httpsize > 0 && m_read_bytes >= m_httpsize) + if (m_read_bytes >= m_httpsize) { m_lasterror = wxSTREAM_EOF; return 0; @@ -415,7 +538,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) 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);