X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/062c4861718a681a27384d6a2313fc26cda3b3e4..ccf0b1d76ce28c0880df6d5c4866aaa548e2e56f:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 19b1edf023..e41bea9b08 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -10,27 +10,25 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "http.h" + #pragma implementation "http.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SOCKETS -#ifndef WX_PRECOMP -#endif - #include #include #include "wx/string.h" #include "wx/tokenzr.h" #include "wx/socket.h" #include "wx/protocol/protocol.h" +#include "wx/url.h" #include "wx/protocol/http.h" #include "wx/sckstrm.h" @@ -47,8 +45,9 @@ wxHTTP::wxHTTP() { m_addr = NULL; m_read = FALSE; + m_proxy_mode = FALSE; - SetNotify(REQ_LOST); + SetNotify(GSOCK_LOST_FLAG); } wxHTTP::~wxHTTP() @@ -69,6 +68,11 @@ wxString wxHTTP::GetContentType() return GetHeader(_T("Content-Type")); } +void wxHTTP::SetProxyMode(bool on) +{ + m_proxy_mode = on; +} + void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) { if (m_read) { @@ -88,7 +92,12 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) wxString wxHTTP::GetHeader(const wxString& header) { - wxNode *node = m_headers.Find(header); + wxNode *node; + wxString upper_header; + + upper_header = header.Upper(); + + node = m_headers.Find(upper_header); if (!node) return wxEmptyString; @@ -122,21 +131,22 @@ bool wxHTTP::ParseHeaders() m_read = TRUE; while (1) { - m_error = GetLine(this, line); - if (m_error != wxPROTO_NOERR) + m_perr = GetLine(this, line); + if (m_perr != wxPROTO_NOERR) return FALSE; if (line.Length() == 0) break; - printf("Header: %s\n", WXSTRINGCAST line); tokenzr.SetString(line, " :\t\n\r"); - if (!tokenzr.HasMoreToken()) + 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); } return TRUE; @@ -146,7 +156,7 @@ bool wxHTTP::Connect(const wxString& host) { wxIPV4address *addr; - if (m_connected) { + if (m_addr) { delete m_addr; m_addr = NULL; Close(); @@ -157,7 +167,7 @@ bool wxHTTP::Connect(const wxString& host) if (!addr->Hostname(host)) { delete m_addr; m_addr = NULL; - m_error = wxPROTO_NETERR; + m_perr = wxPROTO_NETERR; return FALSE; } @@ -169,26 +179,29 @@ bool wxHTTP::Connect(const wxString& host) bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) { - struct sockaddr *raw_addr; - size_t len; - - m_addr = (wxSockAddress *)(addr.GetClassInfo()->CreateObject()); - - addr.Build(raw_addr, len); - m_addr->Disassemble(raw_addr, len); + if (m_addr) { + delete m_addr; + m_addr = NULL; + Close(); + } + m_addr = (wxSockAddress *) addr.Clone(); return TRUE; } bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { - char *tmp_buf; - char buf[HTTP_BSIZE]; - const wxWX2MBbuf pathbuf = path.mb_str(); + 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")); switch (req) { case wxHTTP_GET: - tmp_buf = "GET"; + tmp_buf = _T("GET"); break; default: return FALSE; @@ -198,22 +211,21 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) SetFlags(NONE); Notify(FALSE); - sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char*)pathbuf); - Write(buf, strlen(buf)); + 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)); SendHeaders(); - sprintf(buf, "\n\r"); - Write(buf, strlen(buf)); - - wxString tmp_str; + Write("\n\r", 2); - m_error = GetLine(this, tmp_str); - if (m_error != wxPROTO_NOERR) { + m_perr = GetLine(this, tmp_str); + if (m_perr != wxPROTO_NOERR) { RestoreState(); return FALSE; } if (!tmp_str.Contains(_T("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")); RestoreState(); @@ -227,11 +239,18 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) token.NextToken(); tmp_str2 = token.NextToken(); - switch (wxAtoi(tmp_str2)) { - case 200: + switch (tmp_str2[0]) { + case _T('1'): + /* INFORMATION / SUCCESS */ + break; + case _T('2'): + /* SUCCESS */ + break; + case _T('3'): + /* REDIRECTION */ break; default: - m_error = wxPROTO_NOFILE; + m_perr = wxPROTO_NOFILE; RestoreState(); return FALSE; } @@ -245,37 +264,64 @@ class wxHTTPStream : public wxSocketInputStream { public: wxHTTP *m_http; size_t m_httpsize; + unsigned long m_read_bytes; wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {} - size_t StreamSize() const { return m_httpsize; } + size_t GetSize() const { return m_httpsize; } virtual ~wxHTTPStream(void) { m_http->Abort(); } + +protected: + size_t OnSysRead(void *buffer, size_t bufsize); }; +size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) +{ + size_t ret; + + if (m_httpsize > 0 && m_read_bytes >= m_httpsize) + return 0; + + ret = wxSocketInputStream::OnSysRead(buffer, bufsize); + m_read_bytes += ret; + + return ret; +} + bool wxHTTP::Abort(void) { - return wxSocketClient::Close(); + bool ret, connected; + + ret = wxSocketClient::Close(); + + return ret; } wxInputStream *wxHTTP::GetInputStream(const wxString& path) { wxHTTPStream *inp_stream = new wxHTTPStream(this); + wxString new_path; - if (!m_addr || m_connected) { - m_error = wxPROTO_CONNERR; + m_perr = wxPROTO_CONNERR; + if (!m_addr) return NULL; - } + // We set m_connected back to FALSE so wxSocketBase will know what to do. if (!wxProtocol::Connect(*m_addr)) return NULL; if (!BuildRequest(path, wxHTTP_GET)) return NULL; - wxPrintf(_T("Len = %s\n"), WXSTRINGCAST GetHeader(_T("Content-Length"))); if (!GetHeader(_T("Content-Length")).IsEmpty()) inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length"))); + else + inp_stream->m_httpsize = (size_t)-1; + + inp_stream->m_read_bytes = 0; + + Notify(FALSE); + SetFlags(SPEED | WAITALL); - SetFlags(WAITALL); return inp_stream; }