X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e622163d05d0813bd6fa4223c18e0ec2f6dc074..9f13661f8bce6d5b3dd402d8688de7592957d11e:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 63e0fb4fb9..bea35a2335 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -24,7 +24,12 @@ #include #include + +#ifndef WX_PRECOMP #include "wx/string.h" +#include "wx/app.h" +#endif + #include "wx/tokenzr.h" #include "wx/socket.h" #include "wx/protocol/protocol.h" @@ -33,7 +38,7 @@ #include "wx/sckstrm.h" IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) -IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE) +IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true) #define HTTP_BSIZE 2048 @@ -41,8 +46,8 @@ wxHTTP::wxHTTP() : wxProtocol() { m_addr = NULL; - m_read = FALSE; - m_proxy_mode = FALSE; + m_read = false; + m_proxy_mode = false; m_post_buf = wxEmptyString; m_http_response = 0; @@ -71,13 +76,22 @@ void wxHTTP::SetProxyMode(bool on) m_proxy_mode = on; } -wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) const +wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) { - // we can't convert between const_iterator to iterator otherwise... - wxStringToStringHashMap& headers = (wxStringToStringHashMap&)m_headers; + wxHeaderIterator it = m_headers.begin(); + for ( wxHeaderIterator en = m_headers.end(); it != en; ++it ) + { + if ( wxStricmp(it->first, header) == 0 ) + break; + } + + return it; +} - wxHeaderIterator it = headers.begin(); - for ( wxHeaderIterator en = headers.end(); it != en; ++it ) +wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const +{ + wxHeaderConstIterator it = m_headers.begin(); + for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it ) { if ( wxStricmp(it->first, header) == 0 ) break; @@ -90,7 +104,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) { if (m_read) { ClearHeaders(); - m_read = FALSE; + m_read = false; } wxHeaderIterator it = FindHeader(header); @@ -102,7 +116,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) wxString wxHTTP::GetHeader(const wxString& header) const { - wxHeaderIterator it = FindHeader(header); + wxHeaderConstIterator it = FindHeader(header); return it == m_headers.end() ? wxGetEmptyString() : it->second; } @@ -132,11 +146,11 @@ bool wxHTTP::ParseHeaders() wxStringTokenizer tokenzr; ClearHeaders(); - m_read = TRUE; + m_read = true; #if defined(__VISAGECPP__) // VA just can't stand while(1) - bool bOs2var = TRUE; + bool bOs2var = true; while(bOs2var) #else while (1) @@ -144,7 +158,7 @@ bool wxHTTP::ParseHeaders() { m_perr = GetLine(this, line); if (m_perr != wxPROTO_NOERR) - return FALSE; + return false; if (line.Length() == 0) break; @@ -152,7 +166,7 @@ bool wxHTTP::ParseHeaders() wxString left_str = line.BeforeFirst(':'); m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); } - return TRUE; + return true; } bool wxHTTP::Connect(const wxString& host, unsigned short port) @@ -171,7 +185,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) delete m_addr; m_addr = NULL; m_perr = wxPROTO_NETERR; - return FALSE; + return false; } if ( port ) addr->Service(port); @@ -180,7 +194,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) SetHeader(wxT("Host"), host); - return TRUE; + return true; } bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) @@ -196,7 +210,7 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) if (ipv4addr) SetHeader(wxT("Host"), ipv4addr->OrigHostname()); - return TRUE; + return true; } bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) @@ -209,20 +223,25 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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; + return false; } m_http_response = 0; // If there is no User-Agent defined, define it. if (GetHeader(wxT("User-Agent")).IsNull()) - SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); + SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x")); SaveState(); - SetFlags(wxSOCKET_NONE); - Notify(FALSE); + + // we may use non blocking sockets only if we can dispatch events from them + SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE + : wxSOCKET_BLOCK ); + Notify(false); wxString buf; buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str()); @@ -232,7 +251,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) Write("\r\n", 2); if ( req == wxHTTP_POST ) { - Write(m_post_buf, m_post_buf.Len()); + Write(m_post_buf.mbc_str(), m_post_buf.Len()); m_post_buf = wxEmptyString; } @@ -240,7 +259,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) m_perr = GetLine(this, tmp_str); if (m_perr != wxPROTO_NOERR) { RestoreState(); - return FALSE; + return false; } if (!tmp_str.Contains(wxT("HTTP/"))) { @@ -249,7 +268,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) SetHeader(wxT("Content-Length"), wxT("-1")); SetHeader(wxT("Content-Type"), wxT("none/none")); RestoreState(); - return TRUE; + return true; } wxStringTokenizer token(tmp_str,wxT(' ')); @@ -274,7 +293,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) default: m_perr = wxPROTO_NOFILE; RestoreState(); - return FALSE; + return false; } ret_value = ParseHeaders(); @@ -328,9 +347,9 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) if (!m_addr) return NULL; - // We set m_connected back to FALSE so wxSocketBase will know what to do. + // We set m_connected back to false so wxSocketBase will know what to do. #ifdef __WXMAC__ - wxSocketClient::Connect(*m_addr , FALSE ); + wxSocketClient::Connect(*m_addr , false ); wxSocketClient::WaitOnConnect(10); if (!wxSocketClient::IsConnected()) @@ -352,7 +371,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) inp_stream->m_read_bytes = 0; - Notify(FALSE); + Notify(false); SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL); return inp_stream;