X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a324a7bccf4bda8f4f2bf09daee8104cae953cee..8a729bb860cec596f4ce5a59fabeb4404a266e97:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index cb194e82d3..9f7e3adabc 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -34,7 +34,7 @@ #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) -IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE) +IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE) #endif #define HTTP_BSIZE 2048 @@ -45,6 +45,7 @@ wxHTTP::wxHTTP() { m_addr = NULL; m_read = FALSE; + m_proxy_mode = FALSE; SetNotify(GSOCK_LOST_FLAG); } @@ -64,7 +65,12 @@ wxHTTP::~wxHTTP() 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 +92,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 +113,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\n\r"), head->GetKeyString(), str->GetData()); const wxWX2MBbuf cbuf = buf.mb_str(); Write(cbuf, strlen(cbuf)); @@ -134,6 +145,8 @@ bool wxHTTP::ParseHeaders() wxString left_str = tokenzr.GetNextToken(); wxString *str = new wxString(tokenzr.GetNextToken()); + left_str.MakeUpper(); + m_headers.Append(left_str, (wxObject *) str); } return TRUE; @@ -143,7 +156,7 @@ bool wxHTTP::Connect(const wxString& host) { wxIPV4address *addr; - if (m_connected) { + if (m_addr) { delete m_addr; m_addr = NULL; Close(); @@ -158,7 +171,7 @@ bool wxHTTP::Connect(const wxString& host) return FALSE; } - if (!addr->Service(_T("http"))) + if (!addr->Service(wxT("http"))) addr->Service(80); return TRUE; @@ -180,16 +193,15 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { wxChar *tmp_buf; wxChar buf[200]; // 200 is arbitrary. -#if wxUNICODE - wxWX2MBbuf pathbuf((size_t)200); -#else - const wxWX2MBbuf pathbuf; -#endif - wxString tmp_str; + 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; @@ -199,10 +211,9 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) SetFlags(NONE); Notify(FALSE); - tmp_str = wxURL::ConvertToValidURI(path); - wxSprintf(buf, _T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData()); - pathbuf = wxConvLibc.cWX2MB(buf); - Write(pathbuf, strlen(MBSTRINGCAST pathbuf)); + wxSprintf(buf, wxT("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData()); + const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); + Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); SendHeaders(); Write("\n\r", 2); @@ -212,23 +223,31 @@ 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. - 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_perr = wxPROTO_NOFILE; @@ -248,7 +267,7 @@ public: 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: @@ -270,32 +289,38 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) bool wxHTTP::Abort(void) { - return wxSocketClient::Close(); + bool ret; + + ret = wxSocketClient::Close(); + + return ret; } wxInputStream *wxHTTP::GetInputStream(const wxString& path) { wxHTTPStream *inp_stream = new wxHTTPStream(this); + wxString new_path; - if (!m_addr || m_connected) { - m_perr = wxPROTO_CONNERR; + 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; - if (!GetHeader(_T("Content-Length")).IsEmpty()) - inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length"))); + 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); return inp_stream; }