X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4860d40db4a78d8c2fd20d0b7b75136d749050eb..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/url.cpp diff --git a/src/common/url.cpp b/src/common/url.cpp index a78708b6ee..700cb18d7e 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: url.cpp +// Name: src/common/url.cpp // Purpose: URL parser // Author: Guilhem Lavaux // Modified by: @@ -9,25 +9,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "url.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_URL -#include "wx/string.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/module.h" #include "wx/url.h" +#ifndef WX_PRECOMP + #include "wx/list.h" + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/module.h" +#endif + #include #include @@ -127,56 +126,53 @@ wxURL& wxURL::operator = (const wxString& url) bool wxURL::ParseURL() { - // If the URL was already parsed (m_protocol != NULL), pass this section. - if (!m_protocol) - { - // Clean up - CleanData(); - - // Make sure we have a protocol/scheme - if (!HasScheme()) + // If the URL was already parsed (m_protocol != NULL), pass this section. + if (!m_protocol) { - m_error = wxURL_SNTXERR; - return false; - } + // Clean up + CleanData(); - // Find and create the protocol object - if (!FetchProtocol()) - { - m_error = wxURL_NOPROTO; - return false; - } + // Make sure we have a protocol/scheme + if (!HasScheme()) + { + m_error = wxURL_SNTXERR; + return false; + } - // Do we need a host name ? - if (m_protoinfo->m_needhost) - { - // Make sure we have one, then - if (!HasServer()) - { - 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) + { + // Make sure we have one, then + if (!HasServer()) + { + m_error = wxURL_SNTXERR; + return false; + } + } } - } #if wxUSE_PROTOCOL_HTTP - if (m_useProxy) - { - // destroy the previously created protocol as we'll be using m_proxy - delete m_protocol; - - // Third, we rebuild the URL. - m_url = m_scheme + wxT(":"); - if (m_protoinfo->m_needhost) - m_url = m_url + wxT("//") + m_server; + if (m_useProxy) + { + // Third, we rebuild the URL. + m_url = m_scheme + wxT(":"); + if (m_protoinfo->m_needhost) + m_url = m_url + wxT("//") + m_server; - // We initialize specific variables. - m_protocol = m_proxy; // FIXME: we should clone the protocol - } + // We initialize specific variables. + m_protocol = m_proxy; // FIXME: we should clone the protocol + } #endif // wxUSE_PROTOCOL_HTTP - m_error = wxURL_NOERR; - return true; + m_error = wxURL_NOERR; + return true; } // -------------------------------------------------------------- @@ -186,9 +182,11 @@ bool wxURL::ParseURL() void wxURL::CleanData() { #if wxUSE_PROTOCOL_HTTP - if (!m_useProxy) + if (!m_useProxy) #endif // wxUSE_PROTOCOL_HTTP - delete m_protocol; + if (m_protocol) + // Need to safely delete the socket (pending events) + m_protocol->Destroy(); } wxURL::~wxURL() @@ -209,21 +207,21 @@ wxURL::~wxURL() bool wxURL::FetchProtocol() { - wxProtoInfo *info = ms_protocols; + wxProtoInfo *info = ms_protocols; - while (info) - { - if (m_scheme == info->m_protoname) + while (info) { - if (m_port.IsNull()) - m_port = info->m_servname; - m_protoinfo = info; - m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); - return true; + if (m_scheme == info->m_protoname) + { + if (m_port.IsNull()) + m_port = info->m_servname; + m_protoinfo = info; + m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); + return true; + } + info = info->next; } - info = info->next; - } - return false; + return false; } // -------------------------------------------------------------- @@ -232,125 +230,124 @@ bool wxURL::FetchProtocol() wxInputStream *wxURL::GetInputStream() { - if (!m_protocol) - { - m_error = wxURL_NOPROTO; - return NULL; - } + if (!m_protocol) + { + m_error = wxURL_NOPROTO; + return NULL; + } - m_error = wxURL_NOERR; - if (HasUserInfo()) - { - size_t dwPasswordPos = m_userinfo.find(':'); + m_error = wxURL_NOERR; + if (HasUserInfo()) + { + size_t dwPasswordPos = m_userinfo.find(':'); - if (dwPasswordPos == wxString::npos) - m_protocol->SetUser(m_userinfo); - else - { - m_protocol->SetUser(m_userinfo(0, dwPasswordPos)); - m_protocol->SetPassword(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1)); - } - } + if (dwPasswordPos == wxString::npos) + m_protocol->SetUser(m_userinfo); + else + { + m_protocol->SetUser(m_userinfo(0, dwPasswordPos)); + m_protocol->SetPassword(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1)); + } + } #if wxUSE_URL_NATIVE - // give the native implementation to return a better stream - // such as the native WinINet functionality under MS-Windows - if (m_nativeImp) - { - wxInputStream *rc; - rc = m_nativeImp->GetInputStream(this); - if (rc != 0) - return rc; - } - // else use the standard behaviour + // give the native implementation to return a better stream + // such as the native WinINet functionality under MS-Windows + if (m_nativeImp) + { + wxInputStream *rc; + rc = m_nativeImp->GetInputStream(this); + if (rc != 0) + return rc; + } + // else use the standard behaviour #endif // wxUSE_URL_NATIVE #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_server)) + // m_protoinfo is NULL when we use a proxy + if (!m_useProxy && m_protoinfo->m_needhost) { - m_error = wxURL_NOHOST; - return NULL; - } + if (!addr.Hostname(m_server)) + { + m_error = wxURL_NOHOST; + return NULL; + } - addr.Service(m_port); + addr.Service(m_port); - if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason - { - m_error = wxURL_CONNERR; - return NULL; + if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason + { + m_error = wxURL_CONNERR; + return NULL; + } } - } #endif - // When we use a proxy, we have to pass the whole URL to it. - wxInputStream *the_i_stream; - - if (!m_useProxy) - { - the_i_stream = m_protocol->GetInputStream(m_url); - } - else - { - wxString fullPath = m_path; - - if (HasQuery()) - fullPath += wxT("?") + m_query; - - if (HasFragment()) - fullPath += wxT("#") + m_fragment; - - the_i_stream = m_protocol->GetInputStream(fullPath); - } + wxString fullPath; - if (!the_i_stream) - { - m_error = wxURL_PROTOERR; - return NULL; - } + // When we use a proxy, we have to pass the whole URL to it. + if (m_useProxy) + fullPath += m_url; + + if(m_path.empty()) + fullPath += wxT("/"); + else + fullPath += m_path; + + if (HasQuery()) + fullPath += wxT("?") + m_query; - return the_i_stream; + if (HasFragment()) + fullPath += wxT("#") + m_fragment; + + wxInputStream *the_i_stream = m_protocol->GetInputStream(fullPath); + + if (!the_i_stream) + { + m_error = wxURL_PROTOERR; + return NULL; + } + + return the_i_stream; } #if wxUSE_PROTOCOL_HTTP void wxURL::SetDefaultProxy(const wxString& url_proxy) { - if ( !url_proxy ) - { - if ( ms_proxyDefault ) - { - ms_proxyDefault->Close(); - delete ms_proxyDefault; - ms_proxyDefault = NULL; - } - } - else - { - wxString tmp_str = url_proxy; - int pos = tmp_str.Find(wxT(':')); - if (pos == wxNOT_FOUND) - 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 - } + if ( !url_proxy ) + { + if ( ms_proxyDefault ) + { + ms_proxyDefault->Close(); + delete ms_proxyDefault; + ms_proxyDefault = NULL; + } + } + else + { + wxString tmp_str = url_proxy; + int pos = tmp_str.Find(wxT(':')); + if (pos == wxNOT_FOUND) + 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) @@ -379,7 +376,7 @@ void wxURL::SetProxy(const wxString& url_proxy) return; hostname = tmp_str(0, pos); - port = tmp_str(pos+1, tmp_str.Length()-pos); + port = tmp_str(pos+1, tmp_str.length()-pos); addr.Hostname(hostname); addr.Service(port); @@ -426,7 +423,7 @@ bool wxURLModule::OnInit() // 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") ) + if ( wxGetenv(_T("HTTP_PROXY")) ) { wxURL::ms_useDefaultProxy = true; } @@ -444,5 +441,84 @@ void wxURLModule::OnExit() #endif // wxUSE_SOCKETS -#endif // wxUSE_URL +// --------------------------------------------------------------------------- +// +// wxURL Compatibility +// +// --------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_4 + +#include "wx/url.h" +wxString wxURL::GetProtocolName() const +{ + return m_scheme; +} + +wxString wxURL::GetHostName() const +{ + return m_server; +} + +wxString wxURL::GetPath() const +{ + return m_path; +} + +//Note that this old code really doesn't convert to a URI that well and looks +//more like a dirty hack than anything else... + +wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims) +{ + wxString out_str; + wxString hexa_code; + size_t i; + + for (i = 0; i < uri.Len(); i++) + { + wxChar c = uri.GetChar(i); + + if (c == wxT(' ')) + { + // GRG, Apr/2000: changed to "%20" instead of '+' + + out_str += wxT("%20"); + } + else + { + // GRG, Apr/2000: modified according to the URI definition (RFC 2396) + // + // - Alphanumeric characters are never escaped + // - Unreserved marks are never escaped + // - Delimiters must be escaped if they appear within a component + // but not if they are used to separate components. Here we have + // no clear way to distinguish between these two cases, so they + // are escaped unless they are passed in the 'delims' parameter + // (allowed delimiters). + + static const wxChar marks[] = wxT("-_.!~*()'"); + + if ( !wxIsalnum(c) && !wxStrchr(marks, c) && !wxStrchr(delims, c) ) + { + hexa_code.Printf(wxT("%%%02X"), c); + out_str += hexa_code; + } + else + { + out_str += c; + } + } + } + + return out_str; +} + +wxString wxURL::ConvertFromURI(const wxString& uri) +{ + return wxURI::Unescape(uri); +} + +#endif //WXWIN_COMPATIBILITY_2_4 + +#endif // wxUSE_URL