X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed83150139f5c9e509a4d6256792af9932486a6f..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index bd5aac20f4..8e620d15d9 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "http.h" #endif @@ -44,6 +44,7 @@ wxHTTP::wxHTTP() m_read = FALSE; m_proxy_mode = FALSE; m_post_buf = wxEmptyString; + m_http_response = 0; SetNotify(wxSOCKET_LOST_FLAG); } @@ -70,6 +71,30 @@ void wxHTTP::SetProxyMode(bool on) m_proxy_mode = on; } +wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) +{ + wxHeaderIterator it = m_headers.begin(); + for ( wxHeaderIterator en = m_headers.end(); it != en; ++it ) + { + if ( wxStricmp(it->first, header) == 0 ) + break; + } + + return 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; + } + + return it; +} + void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) { if (m_read) { @@ -77,26 +102,23 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) m_read = FALSE; } - wxStringToStringHashMap::iterator it = m_headers.find(header); + wxHeaderIterator it = FindHeader(header); if (it != m_headers.end()) - it->second = h_data; + it->second = h_data; else - m_headers[header.Upper()] = h_data; + m_headers[header] = h_data; } -wxString wxHTTP::GetHeader(const wxString& header) +wxString wxHTTP::GetHeader(const wxString& header) const { - wxStringToStringHashMap::iterator it = m_headers.find(header.Upper()); - - if (it == m_headers.end()) - return wxEmptyString; + wxHeaderConstIterator it = FindHeader(header); - return it->second; + return it == m_headers.end() ? wxGetEmptyString() : it->second; } void wxHTTP::SetPostBuffer(const wxString& post_buf) { - m_post_buf = post_buf; + m_post_buf = post_buf; } void wxHTTP::SendHeaders() @@ -124,10 +146,11 @@ bool wxHTTP::ParseHeaders() #if defined(__VISAGECPP__) // VA just can't stand while(1) bool bOs2var = TRUE; - while(bOs2var) { + while(bOs2var) #else - while (1) { + while (1) #endif + { m_perr = GetLine(this, line); if (m_perr != wxPROTO_NOERR) return FALSE; @@ -136,8 +159,6 @@ bool wxHTTP::ParseHeaders() break; wxString left_str = line.BeforeFirst(':'); - left_str.MakeUpper(); - m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); } return TRUE; @@ -202,6 +223,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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")); @@ -245,6 +268,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) token.NextToken(); tmp_str2 = token.NextToken(); + m_http_response = wxAtoi(tmp_str2); + switch (tmp_str2[0u]) { case wxT('1'): /* INFORMATION / SUCCESS */