X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a2c6ef8d186df490df28a694820a5e8afc4b5e8..5701b057fb4b5bf672da2fb19230d179f7f3e251:/src/common/http.cpp?ds=inline diff --git a/src/common/http.cpp b/src/common/http.cpp index c8f8b79a04..18beaf43cf 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -10,18 +10,17 @@ ///////////////////////////////////////////////////////////////////////////// #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 -#ifndef WX_PRECOMP -#endif +#if wxUSE_SOCKETS #include #include @@ -29,12 +28,13 @@ #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" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) -IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE) +IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE) #endif #define HTTP_BSIZE 2048 @@ -46,7 +46,7 @@ wxHTTP::wxHTTP() m_addr = NULL; m_read = FALSE; - SetNotify(REQ_LOST); + SetNotify(GSOCK_LOST_FLAG); } wxHTTP::~wxHTTP() @@ -64,7 +64,7 @@ wxHTTP::~wxHTTP() wxString wxHTTP::GetContentType() { - return GetHeader("Content-Type"); + return GetHeader(_T("Content-Type")); } void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) @@ -88,7 +88,7 @@ wxString wxHTTP::GetHeader(const wxString& header) { wxNode *node = m_headers.Find(header); if (!node) - return (char *)NULL; + return wxEmptyString; return *((wxString *)node->Data()); } @@ -102,9 +102,10 @@ void wxHTTP::SendHeaders() wxString *str = (wxString *)head->Data(); wxString buf; - buf.Printf("%s: %s\n\r", head->GetKeyString(), str->GetData()); + buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData()); - Write(buf, buf.Len()); + const wxWX2MBbuf cbuf = buf.mb_str(); + Write(cbuf, strlen(cbuf)); head = head->Next(); } @@ -113,28 +114,25 @@ void wxHTTP::SendHeaders() bool wxHTTP::ParseHeaders() { wxString line; + wxStringTokenizer tokenzr; m_headers.Clear(); 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; - int pos = line.Find(':'); - if (pos == -1) + tokenzr.SetString(line, " :\t\n\r"); + if (!tokenzr.HasMoreTokens()) return FALSE; - wxString left_str = line(0, pos); - wxString right_str = line(pos+1, line.Length()); - - right_str = right_str.Strip(wxString::leading); - - wxString *str = new wxString(right_str); + wxString left_str = tokenzr.GetNextToken(); + wxString *str = new wxString(tokenzr.GetNextToken()); m_headers.Append(left_str, (wxObject *) str); } @@ -156,11 +154,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("http")) + if (!addr->Service(_T("http"))) addr->Service(80); return TRUE; @@ -168,73 +166,103 @@ 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]; + wxChar *tmp_buf; + wxChar buf[200]; // 200 is arbitrary. + wxString tmp_str; switch (req) { case wxHTTP_GET: - tmp_buf = "GET"; + tmp_buf = _T("GET"); break; default: return FALSE; } - sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char *)path); - Write(buf, strlen(buf)); - SendHeaders(); - sprintf(buf, "\n\r"); - Write(buf, strlen(buf)); + SaveState(); + SetFlags(NONE); + Notify(FALSE); - wxString tmp_str; + tmp_str = wxURL::ConvertToValidURI(path); + 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(); + 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("HTTP/")) { + if (!tmp_str.Contains(_T("HTTP/"))) { // TODO: support HTTP v0.9 which can have no header. - SetHeader("Content-Length", "-1"); - SetHeader("Content-Type", "none/none"); + SetHeader(_T("Content-Length"), _T("-1")); + SetHeader(_T("Content-Type"), _T("none/none")); + RestoreState(); return TRUE; } - wxStringTokenizer token(tmp_str,' '); + wxStringTokenizer token(tmp_str,_T(' ')); wxString tmp_str2; + bool ret_value; token.NextToken(); tmp_str2 = token.NextToken(); - switch (atoi(tmp_str2)) { + switch (wxAtoi(tmp_str2)) { case 200: break; default: - m_error = wxPROTO_NOFILE; + m_perr = wxPROTO_NOFILE; + RestoreState(); return FALSE; } - return ParseHeaders(); + ret_value = ParseHeaders(); + RestoreState(); + return ret_value; } 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; } 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(); @@ -245,7 +273,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) wxHTTPStream *inp_stream = new wxHTTPStream(this); if (!m_addr || m_connected) { - m_error = wxPROTO_CONNERR; + m_perr = wxPROTO_CONNERR; return NULL; } @@ -255,5 +283,17 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) if (!BuildRequest(path, wxHTTP_GET)) return NULL; + 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); + return inp_stream; } + +#endif + // wxUSE_SOCKETS