X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..25db1b74f1264c27bbf2e5fcc9f3a19ccc56d5fc:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 869d99b1f3..52f6e362c7 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 @@ -47,7 +45,7 @@ wxHTTP::wxHTTP() m_read = FALSE; m_proxy_mode = FALSE; - SetNotify(GSOCK_LOST_FLAG); + SetNotify(wxSOCKET_LOST_FLAG); } wxHTTP::~wxHTTP() @@ -61,11 +59,16 @@ 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) @@ -96,7 +99,7 @@ wxString wxHTTP::GetHeader(const wxString& header) wxString upper_header; upper_header = header.Upper(); - + node = m_headers.Find(upper_header); if (!node) return wxEmptyString; @@ -113,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)); @@ -130,7 +133,13 @@ bool wxHTTP::ParseHeaders() m_headers.Clear(); 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,13 +147,8 @@ 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()); - + wxString left_str = line.BeforeFirst(':'); + wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both)); left_str.MakeUpper(); m_headers.Append(left_str, (wxObject *) str); @@ -171,7 +175,7 @@ bool wxHTTP::Connect(const wxString& host) return FALSE; } - if (!addr->Service(T("http"))) + if (!addr->Service(wxT("http"))) addr->Service(80); return TRUE; @@ -196,26 +200,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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")); + 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); - wxSprintf(buf, T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData()); + 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_perr = GetLine(this, tmp_str); if (m_perr != wxPROTO_NOERR) { @@ -223,16 +227,16 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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; @@ -240,13 +244,13 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) tmp_str2 = token.NextToken(); switch (tmp_str2[(unsigned int) 0]) { - case T('1'): + 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 +264,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; @@ -289,16 +294,13 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) bool wxHTTP::Abort(void) { - bool ret; - - 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,21 +308,31 @@ 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)) 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; }