X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c980c992630e94e71139660631a77ffbca8ed958..6e040042bae080a3fe8907e3772c103deab91c13:/src/common/http.cpp?ds=inline diff --git a/src/common/http.cpp b/src/common/http.cpp index 06cfbd02e8..d147823f15 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_SOCKETS +#if wxUSE_SOCKETS && wxUSE_STREAMS #include #include @@ -32,10 +32,8 @@ #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 @@ -45,8 +43,9 @@ wxHTTP::wxHTTP() { m_addr = NULL; m_read = FALSE; + m_proxy_mode = FALSE; - SetNotify(REQ_LOST); + SetNotify(wxSOCKET_LOST_FLAG); } wxHTTP::~wxHTTP() @@ -60,11 +59,21 @@ wxHTTP::~wxHTTP() delete string; node = node->Next(); } + + if (m_addr) { + delete m_addr; + m_addr = NULL; + } } wxString wxHTTP::GetContentType() { - return GetHeader(_T("Content-Type")); + return GetHeader(wxT("Content-Type")); +} + +void wxHTTP::SetProxyMode(bool on) +{ + m_proxy_mode = on; } void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) @@ -86,7 +95,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; @@ -102,7 +116,7 @@ void wxHTTP::SendHeaders() 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"), head->GetKeyString(), str->GetData()); const wxWX2MBbuf cbuf = buf.mb_str(); Write(cbuf, strlen(cbuf)); @@ -119,20 +133,23 @@ bool wxHTTP::ParseHeaders() m_headers.Clear(); m_read = TRUE; - while (1) { - m_error = GetLine(this, line); - if (m_error != wxPROTO_NOERR) +#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; 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()); + wxString left_str = line.BeforeFirst(':'); + wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both)); + left_str.MakeUpper(); m_headers.Append(left_str, (wxObject *) str); } @@ -143,7 +160,7 @@ bool wxHTTP::Connect(const wxString& host) { wxIPV4address *addr; - if (m_connected) { + if (m_addr) { delete m_addr; m_addr = NULL; Close(); @@ -154,11 +171,11 @@ 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; } - if (!addr->Service(_T("http"))) + if (!addr->Service(wxT("http"))) addr->Service(80); return TRUE; @@ -166,69 +183,78 @@ 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) { wxChar *tmp_buf; - wxChar buf[200]; - wxWX2MBbuf pathbuf(200); - wxString tmp_str; + wxChar buf[200]; // 200 is arbitrary. + wxString tmp_str = path; + + // If there is no User-Agent defined, define it. + if (GetHeader(wxT("User-Agent")).IsNull()) + SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); switch (req) { case wxHTTP_GET: - tmp_buf = _T("GET"); + tmp_buf = wxT("GET"); break; default: return FALSE; } SaveState(); - SetFlags(NONE); + SetFlags(wxSOCKET_NONE); Notify(FALSE); - tmp_str = wxURL::ConvertToValidURI(path); - wxSprintf(buf, _T("%s %s\n\r"), tmp_buf, tmp_str.GetData()); - pathbuf = wxConvLibc.cWX2MB(buf); - Write(pathbuf, strlen(pathbuf)); + wxSprintf(buf, wxT("%s %s HTTP/1.0\r\n"), tmp_buf, tmp_str.GetData()); + const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); + Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); SendHeaders(); - Write("\n\r", 2); + Write("\r\n", 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/"))) { + if (!tmp_str.Contains(wxT("HTTP/"))) { // TODO: support HTTP v0.9 which can have no header. - SetHeader(_T("Content-Length"), _T("-1")); - SetHeader(_T("Content-Type"), _T("none/none")); + // FIXME: tmp_str is not put back in the in-queue of the socket. + 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 (wxAtoi(tmp_str2)) { - case 200: + switch (tmp_str2[(unsigned int) 0]) { + case wxT('1'): + /* INFORMATION / SUCCESS */ + break; + case wxT('2'): + /* SUCCESS */ + break; + case wxT('3'): + /* REDIRECTION */ break; default: - m_error = wxPROTO_NOFILE; + m_perr = wxPROTO_NOFILE; RestoreState(); return FALSE; } @@ -238,16 +264,34 @@ 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; + 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(); @@ -255,24 +299,33 @@ bool wxHTTP::Abort(void) wxInputStream *wxHTTP::GetInputStream(const wxString& path) { - wxHTTPStream *inp_stream = new wxHTTPStream(this); + wxHTTPStream *inp_stream; - if (!m_addr || m_connected) { - m_error = wxPROTO_CONNERR; + wxString new_path; + + 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"))); + 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(wxSOCKET_BLOCK | wxSOCKET_WAITALL); - SetFlags(WAITALL); return inp_stream; }