X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ccc3a25d878ae0797c2f689f5ef6a8b727786f83..88ff049184c77fd73b60c01f4f831860d2ec5cef:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 66257f4dd5..0ecde88c77 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -4,7 +4,6 @@ // Author: Guilhem Lavaux // Modified by: Simo Virokannas (authentication, Dec 2005) // Created: August 1997 -// RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -48,7 +47,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); @@ -159,6 +157,8 @@ wxString wxHTTP::GetCookie(const wxString& cookie) 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; @@ -191,7 +191,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() @@ -223,7 +265,7 @@ bool wxHTTP::ParseHeaders() if (m_lastError != wxPROTO_NOERR) return false; - if (line.length() == 0) + if ( line.empty() ) break; wxString left_str = line.BeforeFirst(':'); @@ -249,16 +291,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; } @@ -300,30 +340,29 @@ bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait)) return true; } -bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) +bool wxHTTP::BuildRequest(const wxString& path, const wxString& method) { - const wxChar *request; - - switch (req) + // Use the data in the post buffer, if any. + if ( !m_postBuffer.IsEmpty() ) { - 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: - return false; + wxString len; + len << m_postBuffer.GetDataLen(); + + // Content length must be correct, so always set, possibly + // overriding the value set explicitly by a previous call to + // SetHeader("Content-Length"). + 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); } 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 @@ -334,20 +373,24 @@ 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; - buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str()); + buf.Printf(wxT("%s %s HTTP/1.0\r\n"), method, path); const wxWX2MBbuf pathbuf = buf.mb_str(); Write(pathbuf, strlen(pathbuf)); SendHeaders(); 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; @@ -418,7 +461,13 @@ 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(); } @@ -473,7 +522,13 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) return NULL; #endif - if (!BuildRequest(path, m_post_buf.empty() ? wxHTTP_GET : wxHTTP_POST)) + // Use the user-specified method if any or determine the method to use + // automatically depending on whether we have anything to post or not. + wxString method = m_method; + if (method.empty()) + method = m_postBuffer.IsEmpty() ? wxS("GET"): wxS("POST"); + + if (!BuildRequest(path, method)) return NULL; inp_stream = new wxHTTPStream(this);