X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea4f5235fcbfd484a75e295fd266359e4e66c476..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index f9c7722269..8e620d15d9 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -6,10 +6,10 @@ // Created: August 1997 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "http.h" #endif @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_SOCKETS +#if wxUSE_PROTOCOL_HTTP #include #include @@ -32,40 +32,38 @@ #include "wx/protocol/http.h" #include "wx/sckstrm.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) -IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE) -#endif +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; + m_http_response = 0; - SetNotify(GSOCK_LOST_FLAG); + SetNotify(wxSOCKET_LOST_FLAG); } wxHTTP::~wxHTTP() { - // wxString isn't a wxObject - wxNode *node = m_headers.First(); - wxString *string; - - while (node) { - string = (wxString *)node->Data(); - delete string; - node = node->Next(); - } + ClearHeaders(); + + delete m_addr; +} + +void wxHTTP::ClearHeaders() +{ + m_headers.clear(); } wxString wxHTTP::GetContentType() { - return GetHeader(_T("Content-Type")); + return GetHeader(wxT("Content-Type")); } void wxHTTP::SetProxyMode(bool on) @@ -73,52 +71,67 @@ 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) { - m_headers.Clear(); + ClearHeaders(); 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; + wxHeaderConstIterator it = FindHeader(header); - upper_header = header.Upper(); - - 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(_T("%s: %s\n\r"), 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(); } } @@ -127,10 +140,17 @@ bool wxHTTP::ParseHeaders() wxString line; wxStringTokenizer tokenzr; - m_headers.Clear(); + ClearHeaders(); m_read = TRUE; - while (1) { +#if defined(__VISAGECPP__) +// VA just can't stand while(1) + bool bOs2var = TRUE; + while(bOs2var) +#else + while (1) +#endif + { m_perr = GetLine(this, line); if (m_perr != wxPROTO_NOERR) return FALSE; @@ -138,21 +158,13 @@ bool wxHTTP::ParseHeaders() if (line.Length() == 0) break; - tokenzr.SetString(line, " :\t\n\r"); - if (!tokenzr.HasMoreTokens()) - return FALSE; - - wxString left_str = tokenzr.GetNextToken(); - wxString *str = new wxString(tokenzr.GetNextToken()); - - left_str.MakeUpper(); - - m_headers.Append(left_str, (wxObject *) str); + wxString left_str = line.BeforeFirst(':'); + 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; @@ -171,9 +183,12 @@ bool wxHTTP::Connect(const wxString& host) return FALSE; } - if (!addr->Service(_T("http"))) + if ( port ) addr->Service(port); + else if (!addr->Service(wxT("http"))) addr->Service(80); + SetHeader(wxT("Host"), host); + return TRUE; } @@ -181,72 +196,88 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) { if (m_addr) { delete m_addr; - m_addr = NULL; Close(); } - m_addr = (wxSockAddress *) addr.Clone(); + m_addr = addr.Clone(); + + wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address); + if (ipv4addr) + SetHeader(wxT("Host"), ipv4addr->OrigHostname()); + return TRUE; } bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { - wxChar *tmp_buf; - wxChar buf[200]; // 200 is arbitrary. - wxString tmp_str = path; - - // If there is no User-Agent defined, define it. - if (GetHeader(_T("User-Agent")).IsNull()) - SetHeader(_T("User-Agent"), _T("wxWindows 2.x")); + const wxChar *request; switch (req) { case wxHTTP_GET: - tmp_buf = _T("GET"); + request = wxT("GET"); + break; + case wxHTTP_POST: + request = wxT("POST"); break; default: 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")); + SaveState(); - SetFlags(NONE); + SetFlags(wxSOCKET_NONE); Notify(FALSE); - wxSprintf(buf, _T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData()); - const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); - Write(pathbuf, strlen(MBSTRINGCAST pathbuf)); + wxString 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("\n\r", 2); + 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) { RestoreState(); return FALSE; } - if (!tmp_str.Contains(_T("HTTP/"))) { + if (!tmp_str.Contains(wxT("HTTP/"))) { // TODO: support HTTP v0.9 which can have no header. // FIXME: tmp_str is not put back in the in-queue of the socket. - SetHeader(_T("Content-Length"), _T("-1")); - SetHeader(_T("Content-Type"), _T("none/none")); + SetHeader(wxT("Content-Length"), wxT("-1")); + SetHeader(wxT("Content-Type"), wxT("none/none")); RestoreState(); return TRUE; } - wxStringTokenizer token(tmp_str,_T(' ')); + wxStringTokenizer token(tmp_str,wxT(' ')); wxString tmp_str2; bool ret_value; token.NextToken(); tmp_str2 = token.NextToken(); - switch (tmp_str2[(unsigned int) 0]) { - case _T('1'): + m_http_response = wxAtoi(tmp_str2); + + switch (tmp_str2[0u]) { + case wxT('1'): /* INFORMATION / SUCCESS */ break; - case _T('2'): + case wxT('2'): /* SUCCESS */ break; - case _T('3'): + case wxT('3'): /* REDIRECTION */ break; default: @@ -260,7 +291,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) return ret_value; } -class wxHTTPStream : public wxSocketInputStream { +class wxHTTPStream : public wxSocketInputStream +{ public: wxHTTP *m_http; size_t m_httpsize; @@ -272,33 +304,33 @@ 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) + { + m_lasterror = wxSTREAM_EOF; + return 0; + } - if (m_httpsize > 0 && m_read_bytes >= m_httpsize) - return 0; + size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize); + m_read_bytes += ret; - ret = wxSocketInputStream::OnSysRead(buffer, bufsize); - m_read_bytes += ret; - - return ret; + return ret; } bool wxHTTP::Abort(void) { - bool ret, connected; - - ret = wxSocketClient::Close(); - - return ret; + return wxSocketClient::Close(); } wxInputStream *wxHTTP::GetInputStream(const wxString& path) { - wxHTTPStream *inp_stream = new wxHTTPStream(this); + wxHTTPStream *inp_stream; + wxString new_path; m_perr = wxPROTO_CONNERR; @@ -306,24 +338,34 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) return NULL; // We set m_connected back to FALSE so wxSocketBase will know what to do. +#ifdef __WXMAC__ + wxSocketClient::Connect(*m_addr , FALSE ); + wxSocketClient::WaitOnConnect(10); + + if (!wxSocketClient::IsConnected()) + return NULL; +#else if (!wxProtocol::Connect(*m_addr)) return NULL; +#endif - if (!BuildRequest(path, wxHTTP_GET)) + if (!BuildRequest(path, m_post_buf.IsEmpty() ? wxHTTP_GET : wxHTTP_POST)) return NULL; - if (!GetHeader(_T("Content-Length")).IsEmpty()) - inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length"))); + inp_stream = new wxHTTPStream(this); + + if (!GetHeader(wxT("Content-Length")).IsEmpty()) + inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length"))); else inp_stream->m_httpsize = (size_t)-1; inp_stream->m_read_bytes = 0; Notify(FALSE); - SetFlags(SPEED | WAITALL); + SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL); return inp_stream; } -#endif - // wxUSE_SOCKETS +#endif // wxUSE_PROTOCOL_HTTP +