X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fb203e6efec1dbbe59184fb4927dd9b6f0a480f..d2b354f9c9f1473b2d6ff0ab643ebf57dcbfb656:/src/common/http.cpp?ds=sidebyside diff --git a/src/common/http.cpp b/src/common/http.cpp index 55b44ed76d..9758181c72 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -6,7 +6,7 @@ // Created: August 1997 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -38,12 +38,12 @@ IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE) #define HTTP_BSIZE 2048 wxHTTP::wxHTTP() - : wxProtocol(), - m_headers(wxKEY_STRING) + : wxProtocol() { m_addr = NULL; m_read = FALSE; m_proxy_mode = FALSE; + m_post_buf = wxEmptyString; SetNotify(wxSOCKET_LOST_FLAG); } @@ -57,17 +57,7 @@ wxHTTP::~wxHTTP() void wxHTTP::ClearHeaders() { - // wxString isn't a wxObject - wxNode *node = m_headers.First(); - wxString *string; - - while (node) { - string = (wxString *)node->Data(); - delete string; - node = node->Next(); - } - - m_headers.Clear(); + m_headers.clear(); } wxString wxHTTP::GetContentType() @@ -80,6 +70,21 @@ void wxHTTP::SetProxyMode(bool on) m_proxy_mode = on; } +wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) const +{ + // we can't convert between const_iterator to iterator otherwise... + wxStringToStringHashMap& headers = (wxStringToStringHashMap&)m_headers; + + wxHeaderIterator it = headers.begin(); + for ( wxHeaderIterator en = 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) { @@ -87,45 +92,36 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) m_read = FALSE; } - wxNode *node = m_headers.Find(header); - - if (!node) - m_headers.Append(header, (wxObject *)(new wxString(h_data))); - else { - wxString *str = (wxString *)node->Data(); - (*str) = h_data; - } + wxHeaderIterator it = FindHeader(header); + if (it != m_headers.end()) + it->second = h_data; + else + m_headers[header] = h_data; } -wxString wxHTTP::GetHeader(const wxString& header) +wxString wxHTTP::GetHeader(const wxString& header) const { - wxNode *node; - wxString upper_header; - - upper_header = header.Upper(); + wxHeaderIterator it = FindHeader(header); - node = m_headers.Find(upper_header); - if (!node) - return wxEmptyString; + return it == m_headers.end() ? wxGetEmptyString() : it->second; +} - return *((wxString *)node->Data()); +void wxHTTP::SetPostBuffer(const wxString& post_buf) +{ + m_post_buf = post_buf; } void wxHTTP::SendHeaders() { - wxNode *head = m_headers.First(); + typedef wxStringToStringHashMap::iterator iterator; + wxString buf; - while (head) + for (iterator it = m_headers.begin(), en = m_headers.end(); it != en; ++it ) { - wxString *str = (wxString *)head->Data(); - - wxString buf; - buf.Printf(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData()); + buf.Printf(wxT("%s: %s\r\n"), it->first.c_str(), it->second.c_str()); const wxWX2MBbuf cbuf = buf.mb_str(); Write(cbuf, strlen(cbuf)); - - head = head->Next(); } } @@ -140,10 +136,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; @@ -152,15 +149,12 @@ bool wxHTTP::ParseHeaders() break; wxString left_str = line.BeforeFirst(':'); - wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both)); - left_str.MakeUpper(); - - m_headers.Append(left_str, (wxObject *) str); + m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); } return TRUE; } -bool wxHTTP::Connect(const wxString& host) +bool wxHTTP::Connect(const wxString& host, unsigned short port) { wxIPV4address *addr; @@ -179,9 +173,10 @@ bool wxHTTP::Connect(const wxString& host) return FALSE; } - if (!addr->Service(wxT("http"))) + if ( port ) addr->Service(port); + else if (!addr->Service(wxT("http"))) addr->Service(80); - + SetHeader(wxT("Host"), host); return TRUE; @@ -198,18 +193,21 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address); if (ipv4addr) - SetHeader(wxT("Host"), ipv4addr->Hostname()); + SetHeader(wxT("Host"), ipv4addr->OrigHostname()); return TRUE; } bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { - wxChar *tmp_buf; + const wxChar *request; switch (req) { case wxHTTP_GET: - tmp_buf = wxT("GET"); + request = wxT("GET"); + break; + case wxHTTP_POST: + request = wxT("POST"); break; default: return FALSE; @@ -224,12 +222,17 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) Notify(FALSE); wxString buf; - buf.Printf(wxT("%s %s HTTP/1.0\r\n"), tmp_buf, path.c_str()); - const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); + buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str()); + const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf); Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); SendHeaders(); Write("\r\n", 2); + if ( req == wxHTTP_POST ) { + Write(m_post_buf, m_post_buf.Len()); + m_post_buf = wxEmptyString; + } + wxString tmp_str; m_perr = GetLine(this, tmp_str); if (m_perr != wxPROTO_NOERR) { @@ -287,19 +290,22 @@ public: protected: size_t OnSysRead(void *buffer, size_t bufsize); + + DECLARE_NO_COPY_CLASS(wxHTTPStream) }; size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) { - size_t ret; - - if (m_httpsize > 0 && m_read_bytes >= m_httpsize) - return 0; + if (m_httpsize > 0 && m_read_bytes >= m_httpsize) + { + m_lasterror = wxSTREAM_EOF; + return 0; + } - ret = wxSocketInputStream::OnSysRead(buffer, bufsize); - m_read_bytes += ret; + size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize); + m_read_bytes += ret; - return ret; + return ret; } bool wxHTTP::Abort(void) @@ -329,7 +335,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) return NULL; #endif - if (!BuildRequest(path, wxHTTP_GET)) + if (!BuildRequest(path, m_post_buf.IsEmpty() ? wxHTTP_GET : wxHTTP_POST)) return NULL; inp_stream = new wxHTTPStream(this);