X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..f72124dbe5f289165f7c05ba6c3dcbef89e0ead6:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 26820e2f02..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 <stdio.h> #include <stdlib.h> @@ -45,7 +45,7 @@ wxHTTP::wxHTTP() m_read = FALSE; m_proxy_mode = FALSE; - SetNotify(GSOCK_LOST_FLAG); + SetNotify(wxSOCKET_LOST_FLAG); } wxHTTP::~wxHTTP() @@ -59,6 +59,11 @@ wxHTTP::~wxHTTP() delete string; node = node->Next(); } + + if (m_addr) { + delete m_addr; + m_addr = NULL; + } } wxString wxHTTP::GetContentType() @@ -111,7 +116,7 @@ void wxHTTP::SendHeaders() wxString *str = (wxString *)head->Data(); wxString buf; - buf.Printf(wxT("%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)); @@ -142,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); @@ -212,14 +212,14 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) } SaveState(); - SetFlags(NONE); + SetFlags(wxSOCKET_NONE); Notify(FALSE); - wxSprintf(buf, wxT("%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) { @@ -264,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; @@ -293,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; @@ -316,6 +314,8 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) if (!BuildRequest(path, wxHTTP_GET)) return NULL; + inp_stream = new wxHTTPStream(this); + if (!GetHeader(wxT("Content-Length")).IsEmpty()) inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length"))); else @@ -324,7 +324,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) inp_stream->m_read_bytes = 0; Notify(FALSE); - SetFlags(SPEED | WAITALL); + SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL); return inp_stream; }