X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35a4dab713ccc16c2414aa18d360aa40929fd60c..3b59cdbfaf7df79499424c92ff6177736429ff8a:/src/common/url.cpp diff --git a/src/common/url.cpp b/src/common/url.cpp index 9c012d1602..8c680f6905 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -20,52 +20,41 @@ #pragma hdrstop #endif -#if wxUSE_SOCKETS - -#ifndef WX_PRECOMP -#endif - #include #include -// wxWindows headers -#include -#include -#include - -// wxSocket header +#include "wx/string.h" +#include "wx/list.h" +#include "wx/utils.h" #include "wx/url.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxProtoInfo, wxObject) IMPLEMENT_CLASS(wxURL, wxObject) -#endif // Protocols list wxProtoInfo *wxURL::g_protocols = NULL; -wxHTTP *wxURL::g_proxy; -///////////////////////////////////////////////////////////////// -// wxURL //////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////// +#if wxUSE_SOCKETS +wxHTTP *wxURL::g_proxy = NULL; +#endif + +// -------------------------------------------------------------- +// wxURL +// -------------------------------------------------------------- -/* - * -------------------------------------------------------------- - * --------- wxURL CONSTRUCTOR DESTRUCTOR ----------------------- - * -------------------------------------------------------------- - */ +// -------------------------------------------------------------- +// --------- wxURL CONSTRUCTOR DESTRUCTOR ----------------------- +// -------------------------------------------------------------- wxURL::wxURL(const wxString& url) { m_protocol = NULL; - if (g_proxy->IsConnected()) { - m_protocol = g_proxy; - m_protoname = "proxy"; - m_path = url; - return; - } - m_url = url; m_error = wxURL_NOERR; + m_url = url; +#if wxUSE_SOCKETS + m_useProxy = (g_proxy != NULL); + m_proxy = g_proxy; +#endif ParseURL(); } @@ -73,35 +62,57 @@ bool wxURL::ParseURL() { wxString last_url = m_url; - // Clean up - CleanData(); - - // Extract protocol name - if (!PrepProto(last_url)) { - m_error = wxURL_SNTXERR; - return FALSE; - } + // If the URL was already parsed (so m_protocol != NULL), we pass this section. + if (!m_protocol) { - // Find and create the protocol object - if (!FetchProtocol()) { - m_error = wxURL_NOPROTO; - return FALSE; - } + // Clean up + CleanData(); - // Do we need a host name ? - if (m_protoinfo->m_needhost) { - // Extract it - if (!PrepHost(last_url)) { + // Extract protocol name + if (!PrepProto(last_url)) { m_error = wxURL_SNTXERR; return FALSE; } + + // Find and create the protocol object + if (!FetchProtocol()) { + m_error = wxURL_NOPROTO; + return FALSE; + } + + // Do we need a host name ? + if (m_protoinfo->m_needhost) { + // Extract it + if (!PrepHost(last_url)) { + m_error = wxURL_SNTXERR; + return FALSE; + } + } + + // Extract full path + if (!PrepPath(last_url)) { + m_error = wxURL_NOPATH; + return FALSE; + } } + // URL parse finished. - // Extract full path - if (!PrepPath(last_url)) { - m_error = wxURL_NOPATH; - return FALSE; +#if wxUSE_SOCKETS + if (m_useProxy) { + // We destroy the newly created protocol. + CleanData(); + + // Third, we rebuild the URL. + m_url = m_protoname + wxT(":"); + if (m_protoinfo->m_needhost) + m_url = m_url + wxT("//") + m_hostname; + + m_url += m_path; + + // We initialize specific variables. + m_protocol = m_proxy; // FIXME: we should clone the protocol } +#endif m_error = wxURL_NOERR; return TRUE; @@ -109,26 +120,31 @@ bool wxURL::ParseURL() void wxURL::CleanData() { - if (m_protoname != "proxy") +#if wxUSE_SOCKETS + if (!m_useProxy) +#endif delete m_protocol; } wxURL::~wxURL() { CleanData(); +#if wxUSE_SOCKETS + if (m_proxy && m_proxy != g_proxy) + delete m_proxy; +#endif } -/* - * -------------------------------------------------------------- - * --------- wxURL urls decoders -------------------------------- - * -------------------------------------------------------------- - */ +// -------------------------------------------------------------- +// --------- wxURL urls decoders -------------------------------- +// -------------------------------------------------------------- + bool wxURL::PrepProto(wxString& url) { int pos; // Find end - pos = url.Find(':'); + pos = url.Find(wxT(':')); if (pos == -1) return FALSE; @@ -144,12 +160,12 @@ bool wxURL::PrepHost(wxString& url) wxString temp_url; int pos, pos2; - if ((url.GetChar(0) != '/') || (url.GetChar(1) != '/')) + if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/'))) return FALSE; url = url(2, url.Length()); - pos = url.Find('/'); + pos = url.Find(wxT('/')); if (pos == -1) pos = url.Length(); @@ -157,10 +173,10 @@ bool wxURL::PrepHost(wxString& url) return FALSE; temp_url = url(0, pos); - url = url(url.Find('/'), url.Length()); + url = url(url.Find(wxT('/')), url.Length()); // Retrieve service number - pos2 = temp_url.Find(':', TRUE); + pos2 = temp_url.Find(wxT(':'), TRUE); if (pos2 != -1 && pos2 < pos) { m_servname = temp_url(pos2+1, pos); if (!m_servname.IsNumber()) @@ -169,18 +185,18 @@ bool wxURL::PrepHost(wxString& url) } // Retrieve user and password. - pos2 = temp_url.Find('@'); + pos2 = temp_url.Find(wxT('@')); // Even if pos2 equals -1, this code is right. m_hostname = temp_url(pos2+1, temp_url.Length()); - m_user = ""; - m_password = ""; + m_user = wxT(""); + m_password = wxT(""); if (pos2 == -1) return TRUE; temp_url = temp_url(0, pos2); - pos2 = temp_url.Find(':'); + pos2 = temp_url.Find(wxT(':')); if (pos2 == -1) return FALSE; @@ -194,9 +210,9 @@ bool wxURL::PrepHost(wxString& url) bool wxURL::PrepPath(wxString& url) { if (url.Length() != 0) - m_path = url; + m_path = ConvertToValidURI(url); else - m_path = "/"; + m_path = wxT("/"); return TRUE; } @@ -211,7 +227,6 @@ bool wxURL::FetchProtocol() m_protoinfo = info; m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); - wxSocketHandler::Master().Register(m_protocol); return TRUE; } info = info->next; @@ -219,32 +234,30 @@ bool wxURL::FetchProtocol() return FALSE; } -/* - * -------------------------------------------------------------- - * --------- wxURL get ------------------------------------------ - * -------------------------------------------------------------- - */ -wxInputStream *wxURL::GetInputStream(void) +// -------------------------------------------------------------- +// --------- wxURL get ------------------------------------------ +// -------------------------------------------------------------- + +wxInputStream *wxURL::GetInputStream() { - wxIPV4address addr; wxInputStream *the_i_stream = NULL; - if (!m_protocol) - if (!ParseURL()) - return NULL; - if (!m_protocol) { m_error = wxURL_NOPROTO; return NULL; } m_error = wxURL_NOERR; - if (m_user != "") { + if (m_user != wxT("")) { m_protocol->SetUser(m_user); m_protocol->SetPassword(m_password); } - if (m_protoinfo->m_needhost) { +#if wxUSE_SOCKETS + wxIPV4address addr; + + // m_protoinfo is NULL when we use a proxy + if (!m_useProxy && m_protoinfo->m_needhost) { if (!addr.Hostname(m_hostname)) { m_error = wxURL_NOHOST; return NULL; @@ -258,8 +271,14 @@ wxInputStream *wxURL::GetInputStream(void) return NULL; } } +#endif + + // When we use a proxy, we have to pass the whole URL to it. + if (m_useProxy) + the_i_stream = m_protocol->GetInputStream(m_url); + else + the_i_stream = m_protocol->GetInputStream(m_path); - the_i_stream = m_protocol->GetInputStream(m_path); if (!the_i_stream) { m_error = wxURL_PROTOERR; return NULL; @@ -268,53 +287,126 @@ wxInputStream *wxURL::GetInputStream(void) return the_i_stream; } +#if wxUSE_SOCKETS void wxURL::SetDefaultProxy(const wxString& url_proxy) { - g_proxy->Close(); - - if (url_proxy.IsNull()) + if (url_proxy.IsNull()) { + g_proxy->Close(); + delete g_proxy; + g_proxy = NULL; return; + } wxString tmp_str = url_proxy; - int pos = tmp_str.Find(':'); + int pos = tmp_str.Find(wxT(':')); + if (pos == -1) + return; + wxString hostname = tmp_str(0, pos), - port = tmp_str(pos, tmp_str.Length()-pos); + port = tmp_str(pos+1, tmp_str.Length()-pos); wxIPV4address addr; - addr.Hostname(hostname); - addr.Service(port); - + if (!addr.Hostname(hostname)) + return; + if (!addr.Service(port)) + return; + + if (g_proxy) + // Finally, when all is right, we connect the new proxy. + g_proxy->Close(); + else + g_proxy = new wxHTTP(); g_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason } void wxURL::SetProxy(const wxString& url_proxy) { if (url_proxy.IsNull()) { - m_proxy.Close(); + if (m_proxy) { + m_proxy->Close(); + delete m_proxy; + } + m_useProxy = FALSE; return; } - CleanData(); - wxString tmp_str; wxString hostname, port; int pos; wxIPV4address addr; tmp_str = url_proxy; - pos = tmp_str.Find(':'); + pos = tmp_str.Find(wxT(':')); + // This is an invalid proxy name. + if (pos == -1) + return; + hostname = tmp_str(0, pos); port = tmp_str(pos, tmp_str.Length()-pos); addr.Hostname(hostname); addr.Service(port); - m_proxy.Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason + // Finally, create the whole stuff. + if (m_proxy && m_proxy != g_proxy) + delete m_proxy; + m_proxy = new wxHTTP(); + m_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason - m_protocol = &m_proxy; - m_protoname = "proxy"; - m_path = url_proxy; + CleanData(); + // Reparse url. + m_useProxy = TRUE; + ParseURL(); } - #endif - // wxUSE_SOCKETS + +wxString wxURL::ConvertToValidURI(const wxString& uri) +{ + wxString out_str; + wxString hexa_code; + size_t i; + + for (i=0;i= wxT('A') && uri[i] <= wxT('F')) + code = (uri[i] - wxT('A') + 10) * 16; + else + code = (uri[i] - wxT('0')) * 16; + i++; + if (uri[i] >= wxT('A') && uri[i] <= wxT('F')) + code += (uri[i] - wxT('A')) + 10; + else + code += (uri[i] - wxT('0')); + i++; + new_uri += (wxChar)code; + continue; + } + new_uri += uri[i]; + i++; + } + return new_uri; +}