X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..ddbfcced85b54ed15ff40605d29e55d73d0e6d03:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 9f7e3adabc..5a79944d28 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_SOCKETS +#if wxUSE_PROTOCOL_HTTP #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, wxT("http"), wxT("80"), TRUE) -#endif #define HTTP_BSIZE 2048 @@ -47,10 +45,17 @@ wxHTTP::wxHTTP() m_read = FALSE; m_proxy_mode = FALSE; - SetNotify(GSOCK_LOST_FLAG); + SetNotify(wxSOCKET_LOST_FLAG); } wxHTTP::~wxHTTP() +{ + ClearHeaders(); + + delete m_addr; +} + +void wxHTTP::ClearHeaders() { // wxString isn't a wxObject wxNode *node = m_headers.First(); @@ -61,6 +66,8 @@ wxHTTP::~wxHTTP() delete string; node = node->Next(); } + + m_headers.Clear(); } wxString wxHTTP::GetContentType() @@ -76,7 +83,7 @@ void wxHTTP::SetProxyMode(bool on) void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) { if (m_read) { - m_headers.Clear(); + ClearHeaders(); m_read = FALSE; } @@ -96,7 +103,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 +120,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)); @@ -127,10 +134,16 @@ bool wxHTTP::ParseHeaders() wxString line; wxStringTokenizer tokenzr; - m_headers.Clear(); + ClearHeaders(); 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 +151,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); @@ -174,6 +182,8 @@ bool wxHTTP::Connect(const wxString& host) if (!addr->Service(wxT("http"))) addr->Service(80); + SetHeader(wxT("Host"), host); + return TRUE; } @@ -181,42 +191,46 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) { if (m_addr) { delete m_addr; - m_addr = NULL; Close(); } - m_addr = (wxSockAddress *) addr.Clone(); + m_addr = addr.Clone(); + + wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address); + if (ipv4addr) + SetHeader(wxT("Host"), ipv4addr->OrigHostname()); + return TRUE; } bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { - wxChar *tmp_buf; - 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")); + const wxChar *request; switch (req) { case wxHTTP_GET: - tmp_buf = wxT("GET"); + request = wxT("GET"); break; default: return FALSE; } + // If there is no User-Agent defined, define it. + if (GetHeader(wxT("User-Agent")).IsNull()) + SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); + SaveState(); - SetFlags(NONE); + SetFlags(wxSOCKET_NONE); Notify(FALSE); - wxSprintf(buf, wxT("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData()); - const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); + wxString buf; + buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str()); + const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf); Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); SendHeaders(); - Write("\n\r", 2); + Write("\r\n", 2); + wxString tmp_str; m_perr = GetLine(this, tmp_str); if (m_perr != wxPROTO_NOERR) { RestoreState(); @@ -239,7 +253,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) token.NextToken(); tmp_str2 = token.NextToken(); - switch (tmp_str2[(unsigned int) 0]) { + switch (tmp_str2[0u]) { case wxT('1'): /* INFORMATION / SUCCESS */ break; @@ -260,7 +274,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; @@ -272,6 +287,8 @@ public: protected: size_t OnSysRead(void *buffer, size_t bufsize); + + DECLARE_NO_COPY_CLASS(wxHTTPStream) }; size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) @@ -289,16 +306,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,12 +320,22 @@ 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; + inp_stream = new wxHTTPStream(this); + if (!GetHeader(wxT("Content-Length")).IsEmpty()) inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length"))); else @@ -320,10 +344,10 @@ 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; } -#endif - // wxUSE_SOCKETS +#endif // wxUSE_PROTOCOL_HTTP +