X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f61815af20ebb943000d36ea01489f6115e4061c..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/url.cpp diff --git a/src/common/url.cpp b/src/common/url.cpp index 307bf7627f..f10cd6c903 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -20,24 +20,33 @@ #pragma hdrstop #endif -#if wxUSE_SOCKETS +#if wxUSE_URL + +#include "wx/string.h" +#include "wx/list.h" +#include "wx/utils.h" +#include "wx/module.h" +#include "wx/url.h" #include #include -#include -#include -#include -#include - -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxProtoInfo, wxObject) IMPLEMENT_CLASS(wxURL, wxObject) -#endif // Protocols list -wxProtoInfo *wxURL::g_protocols = NULL; -wxHTTP *wxURL::g_proxy = NULL; +wxProtoInfo *wxURL::ms_protocols = NULL; + +// Enforce linking of protocol classes: +USE_PROTOCOL(wxFileProto) + +#if wxUSE_SOCKETS +USE_PROTOCOL(wxHTTP) +USE_PROTOCOL(wxFTP) + + wxHTTP *wxURL::ms_proxyDefault = NULL; + bool wxURL::ms_useDefaultProxy = FALSE; +#endif // -------------------------------------------------------------- // wxURL @@ -49,67 +58,90 @@ wxHTTP *wxURL::g_proxy = NULL; wxURL::wxURL(const wxString& url) { - m_protocol = NULL; - m_error = wxURL_NOERR; - m_url = url; - m_useProxy = (g_proxy != NULL); - m_proxy = g_proxy; - ParseURL(); + m_protocol = NULL; + m_error = wxURL_NOERR; + m_url = url; + +#if wxUSE_SOCKETS + if ( ms_useDefaultProxy && !ms_proxyDefault ) + { + SetDefaultProxy(getenv("HTTP_PROXY")); + + if ( !ms_proxyDefault ) + { + // don't try again + ms_useDefaultProxy = FALSE; + } + } + + m_useProxy = ms_proxyDefault != NULL; + m_proxy = ms_proxyDefault; +#endif // wxUSE_SOCKETS + + ParseURL(); } bool wxURL::ParseURL() { wxString last_url = m_url; - // If the URL was already parsed (so m_protocol != NULL), we pass this section. - if (!m_protocol) { - + // If the URL was already parsed (m_protocol != NULL), pass this section. + if (!m_protocol) + { // Clean up CleanData(); // Extract protocol name - if (!PrepProto(last_url)) { + if (!PrepProto(last_url)) + { m_error = wxURL_SNTXERR; return FALSE; } // Find and create the protocol object - if (!FetchProtocol()) { + if (!FetchProtocol()) + { m_error = wxURL_NOPROTO; return FALSE; } // Do we need a host name ? - if (m_protoinfo->m_needhost) { + if (m_protoinfo->m_needhost) + { // Extract it - if (!PrepHost(last_url)) { + if (!PrepHost(last_url)) + { m_error = wxURL_SNTXERR; return FALSE; } } // Extract full path - if (!PrepPath(last_url)) { + if (!PrepPath(last_url)) + { m_error = wxURL_NOPATH; return FALSE; } } // URL parse finished. - if (m_useProxy) { +#if wxUSE_SOCKETS + if (m_useProxy) + { // We destroy the newly created protocol. CleanData(); // Third, we rebuild the URL. - m_url = m_protoname + _T(":"); + m_url = m_protoname + wxT(":"); if (m_protoinfo->m_needhost) - m_url = m_url + _T("//") + m_hostname; + 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; @@ -117,15 +149,19 @@ bool wxURL::ParseURL() void wxURL::CleanData() { +#if wxUSE_SOCKETS if (!m_useProxy) +#endif delete m_protocol; } wxURL::~wxURL() { CleanData(); - if (m_proxy && m_proxy != g_proxy) +#if wxUSE_SOCKETS + if (m_proxy && m_proxy != ms_proxyDefault) delete m_proxy; +#endif } // -------------------------------------------------------------- @@ -137,7 +173,7 @@ bool wxURL::PrepProto(wxString& url) int pos; // Find end - pos = url.Find(_T(':')); + pos = url.Find(wxT(':')); if (pos == -1) return FALSE; @@ -153,12 +189,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(_T('/')); + pos = url.Find(wxT('/')); if (pos == -1) pos = url.Length(); @@ -166,11 +202,12 @@ bool wxURL::PrepHost(wxString& url) return FALSE; temp_url = url(0, pos); - url = url(url.Find(_T('/')), url.Length()); + url = url(url.Find(wxT('/')), url.Length()); // Retrieve service number - pos2 = temp_url.Find(_T(':'), TRUE); - if (pos2 != -1 && pos2 < pos) { + pos2 = temp_url.Find(wxT(':'), TRUE); + if (pos2 != -1 && pos2 < pos) + { m_servname = temp_url(pos2+1, pos); if (!m_servname.IsNumber()) return FALSE; @@ -178,18 +215,18 @@ bool wxURL::PrepHost(wxString& url) } // Retrieve user and password. - pos2 = temp_url.Find(_T('@')); + 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 = _T(""); - m_password = _T(""); + m_user = wxT(""); + m_password = wxT(""); if (pos2 == -1) return TRUE; temp_url = temp_url(0, pos2); - pos2 = temp_url.Find(_T(':')); + pos2 = temp_url.Find(wxT(':')); if (pos2 == -1) return FALSE; @@ -205,16 +242,18 @@ bool wxURL::PrepPath(wxString& url) if (url.Length() != 0) m_path = ConvertToValidURI(url); else - m_path = _T("/"); + m_path = wxT("/"); return TRUE; } bool wxURL::FetchProtocol() { - wxProtoInfo *info = g_protocols; + wxProtoInfo *info = ms_protocols; - while (info) { - if (m_protoname == info->m_protoname) { + while (info) + { + if (m_protoname == info->m_protoname) + { if (m_servname.IsNull()) m_servname = info->m_servname; @@ -231,25 +270,31 @@ bool wxURL::FetchProtocol() // --------- wxURL get ------------------------------------------ // -------------------------------------------------------------- -wxInputStream *wxURL::GetInputStream(void) +wxInputStream *wxURL::GetInputStream() { - wxIPV4address addr; wxInputStream *the_i_stream = NULL; - if (!m_protocol) { + if (!m_protocol) + { m_error = wxURL_NOPROTO; return NULL; } m_error = wxURL_NOERR; - if (m_user != _T("")) { + if (m_user != wxT("")) + { m_protocol->SetUser(m_user); m_protocol->SetPassword(m_password); } +#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)) { + if (!m_useProxy && m_protoinfo->m_needhost) + { + if (!addr.Hostname(m_hostname)) + { m_error = wxURL_NOHOST; return NULL; } @@ -262,6 +307,7 @@ wxInputStream *wxURL::GetInputStream(void) return NULL; } } +#endif // When we use a proxy, we have to pass the whole URL to it. if (m_useProxy) @@ -269,7 +315,8 @@ wxInputStream *wxURL::GetInputStream(void) else the_i_stream = m_protocol->GetInputStream(m_path); - if (!the_i_stream) { + if (!the_i_stream) + { m_error = wxURL_PROTOERR; return NULL; } @@ -277,99 +324,205 @@ wxInputStream *wxURL::GetInputStream(void) return the_i_stream; } +#if wxUSE_SOCKETS void wxURL::SetDefaultProxy(const wxString& url_proxy) { - if (url_proxy.IsNull()) { - g_proxy->Close(); - delete g_proxy; - g_proxy = NULL; - return; + if ( !url_proxy ) + { + if ( ms_proxyDefault ) + { + ms_proxyDefault->Close(); + delete ms_proxyDefault; + ms_proxyDefault = NULL; + } } - - wxString tmp_str = url_proxy; - int pos = tmp_str.Find(_T(':')); - if (pos == -1) - return; - - wxString hostname = tmp_str(0, pos), - port = tmp_str(pos+1, tmp_str.Length()-pos); - wxIPV4address addr; - - 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 + { + wxString tmp_str = url_proxy; + int pos = tmp_str.Find(wxT(':')); + if (pos == -1) + return; + + wxString hostname = tmp_str(0, pos), + port = tmp_str(pos+1, tmp_str.Length()-pos); + wxIPV4address addr; + + if (!addr.Hostname(hostname)) + return; + if (!addr.Service(port)) + return; + + if (ms_proxyDefault) + // Finally, when all is right, we connect the new proxy. + ms_proxyDefault->Close(); + else + ms_proxyDefault = new wxHTTP(); + ms_proxyDefault->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason + } } void wxURL::SetProxy(const wxString& url_proxy) { - if (url_proxy.IsNull()) { - if (m_proxy) { - m_proxy->Close(); - delete m_proxy; - } - m_useProxy = FALSE; - return; - } - - wxString tmp_str; - wxString hostname, port; - int pos; - wxIPV4address addr; - - tmp_str = url_proxy; - pos = tmp_str.Find(_T(':')); - // 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); - - // 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 + if ( !url_proxy ) + { + if ( m_proxy && m_proxy != ms_proxyDefault ) + { + m_proxy->Close(); + delete m_proxy; + } - CleanData(); - // Reparse url. - m_useProxy = TRUE; - ParseURL(); + m_useProxy = FALSE; + } + else + { + wxString tmp_str; + wxString hostname, port; + int pos; + wxIPV4address addr; + + tmp_str = url_proxy; + 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); + + // Finally, create the whole stuff. + if (m_proxy && m_proxy != ms_proxyDefault) + delete m_proxy; + m_proxy = new wxHTTP(); + m_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason + + CleanData(); + // Reparse url. + m_useProxy = TRUE; + ParseURL(); + } } +#endif // wxUSE_SOCKETS -wxString wxURL::ConvertToValidURI(const wxString& uri) +wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims) { 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; +} + +// ---------------------------------------------------------------------- +// A module which deletes the default proxy if we created it +// ---------------------------------------------------------------------- + +#if wxUSE_SOCKETS + +class wxURLModule : public wxModule +{ +public: + virtual bool OnInit(); + virtual void OnExit(); + +private: + DECLARE_DYNAMIC_CLASS(wxURLModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule) + +bool wxURLModule::OnInit() +{ + // env var HTTP_PROXY contains the address of the default proxy to use if + // set, but don't try to create this proxy right now because it will slow + // down the program startup (especially if there is no DNS server + // available, in which case it may take up to 1 minute) + + if ( getenv("HTTP_PROXY") ) + { + wxURL::ms_useDefaultProxy = TRUE; + } + + return TRUE; +} + +void wxURLModule::OnExit() +{ + delete wxURL::ms_proxyDefault; + wxURL::ms_proxyDefault = NULL; +} + +#endif // wxUSE_SOCKETS + +#endif // wxUSE_URL +