// Created: 20/07/1997
// RCS-ID: $Id$
// Copyright: (c) 1997, 1998 Guilhem Lavaux
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "url.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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"
+
#include <string.h>
#include <ctype.h>
-#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
+IMPLEMENT_CLASS(wxURL, wxURI)
// Protocols list
-wxProtoInfo *wxURL::g_protocols = NULL;
+wxProtoInfo *wxURL::ms_protocols = NULL;
-#if wxUSE_SOCKETS
-wxHTTP *wxURL::g_proxy = NULL;
+// Enforce linking of protocol classes:
+USE_PROTOCOL(wxFileProto)
+
+#if wxUSE_PROTOCOL_HTTP
+USE_PROTOCOL(wxHTTP)
+
+ wxHTTP *wxURL::ms_proxyDefault = NULL;
+ bool wxURL::ms_useDefaultProxy = false;
+#endif
+
+#if wxUSE_PROTOCOL_FTP
+USE_PROTOCOL(wxFTP)
#endif
// --------------------------------------------------------------
-// wxURL
+//
+// wxURL
+//
// --------------------------------------------------------------
// --------------------------------------------------------------
-// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// Construction
// --------------------------------------------------------------
-wxURL::wxURL(const wxString& url)
+wxURL::wxURL(const wxString& url) : wxURI(url)
{
- m_protocol = NULL;
- m_error = wxURL_NOERR;
- m_url = url;
-#if wxUSE_SOCKETS
- m_useProxy = (g_proxy != NULL);
- m_proxy = g_proxy;
-#endif
- ParseURL();
+ Init(url);
+ ParseURL();
}
-bool wxURL::ParseURL()
+wxURL::wxURL(const wxURI& url) : wxURI(url)
{
- wxString last_url = m_url;
+ Init(url.BuildURI());
+ ParseURL();
+}
- // If the URL was already parsed (so m_protocol != NULL), we pass this section.
- if (!m_protocol) {
+void wxURL::Init(const wxString& url)
+{
+ m_protocol = NULL;
+ m_error = wxURL_NOERR;
+ m_url = url;
+#if wxUSE_URL_NATIVE
+ m_nativeImp = CreateNativeImpObject();
+#endif
- // Clean up
- CleanData();
+#if wxUSE_PROTOCOL_HTTP
+ if ( ms_useDefaultProxy && !ms_proxyDefault )
+ {
+ SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
- // Extract protocol name
- if (!PrepProto(last_url)) {
- m_error = wxURL_SNTXERR;
- return FALSE;
+ if ( !ms_proxyDefault )
+ {
+ // don't try again
+ ms_useDefaultProxy = false;
+ }
}
- // Find and create the protocol object
- if (!FetchProtocol()) {
- m_error = wxURL_NOPROTO;
- return FALSE;
- }
+ m_useProxy = ms_proxyDefault != NULL;
+ m_proxy = ms_proxyDefault;
+#endif // wxUSE_PROTOCOL_HTTP
- // 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.
+// --------------------------------------------------------------
+// Assignment
+// --------------------------------------------------------------
-#if wxUSE_SOCKETS
- if (m_useProxy) {
- // We destroy the newly created protocol.
- CleanData();
+wxURL& wxURL::operator = (const wxURI& url)
+{
+ wxURI::operator = (url);
+ Init(url.BuildURI());
+ ParseURL();
+ return *this;
+}
+wxURL& wxURL::operator = (const wxString& url)
+{
+ wxURI::operator = (url);
+ Init(url);
+ ParseURL();
+ return *this;
+}
- // Third, we rebuild the URL.
- m_url = m_protoname + _T(":");
- if (m_protoinfo->m_needhost)
- m_url = m_url + _T("//") + m_hostname;
+// --------------------------------------------------------------
+// ParseURL
+//
+// Builds the URL and takes care of the old protocol stuff
+// --------------------------------------------------------------
- m_url += m_path;
+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())
+ {
+ 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;
+ }
+ }
+ }
- // We initialize specific variables.
- m_protocol = m_proxy; // FIXME: we should clone the protocol
- }
-#endif
+#if wxUSE_PROTOCOL_HTTP
+ 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
+ }
+#endif // wxUSE_PROTOCOL_HTTP
- m_error = wxURL_NOERR;
- return TRUE;
+ m_error = wxURL_NOERR;
+ return true;
}
+// --------------------------------------------------------------
+// Destruction/Cleanup
+// --------------------------------------------------------------
+
void wxURL::CleanData()
{
-#if wxUSE_SOCKETS
- if (!m_useProxy)
-#endif
- delete m_protocol;
+#if wxUSE_PROTOCOL_HTTP
+ if (!m_useProxy)
+#endif // wxUSE_PROTOCOL_HTTP
+ delete m_protocol;
}
wxURL::~wxURL()
{
- CleanData();
-#if wxUSE_SOCKETS
- if (m_proxy && m_proxy != g_proxy)
- delete m_proxy;
+ CleanData();
+#if wxUSE_PROTOCOL_HTTP
+ if (m_proxy && m_proxy != ms_proxyDefault)
+ delete m_proxy;
+#endif // wxUSE_PROTOCOL_HTTP
+#if wxUSE_URL_NATIVE
+ delete m_nativeImp;
#endif
}
// --------------------------------------------------------------
-// --------- wxURL urls decoders --------------------------------
+// FetchProtocol
// --------------------------------------------------------------
-bool wxURL::PrepProto(wxString& url)
+bool wxURL::FetchProtocol()
{
- int pos;
-
- // Find end
- pos = url.Find(_T(':'));
- if (pos == -1)
- return FALSE;
+ wxProtoInfo *info = ms_protocols;
- m_protoname = url(0, pos);
-
- url = url(pos+1, url.Length());
-
- return TRUE;
+ while (info)
+ {
+ 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;
+ }
+ return false;
}
-bool wxURL::PrepHost(wxString& url)
-{
- wxString temp_url;
- int pos, pos2;
+// --------------------------------------------------------------
+// GetInputStream
+// --------------------------------------------------------------
- if ((url.GetChar(0) != '/') || (url.GetChar(1) != '/'))
- return FALSE;
+wxInputStream *wxURL::GetInputStream()
+{
+ if (!m_protocol)
+ {
+ m_error = wxURL_NOPROTO;
+ return NULL;
+ }
- url = url(2, url.Length());
+ 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));
+ }
+ }
- pos = url.Find(_T('/'));
- if (pos == -1)
- pos = url.Length();
+#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
+#endif // wxUSE_URL_NATIVE
- if (pos == 0)
- return FALSE;
+#if wxUSE_SOCKETS
+ wxIPV4address addr;
- temp_url = url(0, pos);
- url = url(url.Find(_T('/')), url.Length());
+ // m_protoinfo is NULL when we use a proxy
+ if (!m_useProxy && m_protoinfo->m_needhost)
+ {
+ if (!addr.Hostname(m_server))
+ {
+ m_error = wxURL_NOHOST;
+ return NULL;
+ }
+
+ addr.Service(m_port);
+
+ if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason
+ {
+ m_error = wxURL_CONNERR;
+ return NULL;
+ }
+ }
+#endif
- // Retrieve service number
- pos2 = temp_url.Find(_T(':'), TRUE);
- if (pos2 != -1 && pos2 < pos) {
- m_servname = temp_url(pos2+1, pos);
- if (!m_servname.IsNumber())
- return FALSE;
- temp_url = temp_url(0, pos2);
- }
+ wxString fullPath;
- // Retrieve user and password.
- pos2 = temp_url.Find(_T('@'));
- // Even if pos2 equals -1, this code is right.
- m_hostname = temp_url(pos2+1, temp_url.Length());
+ // When we use a proxy, we have to pass the whole URL to it.
+ if (m_useProxy)
+ fullPath += m_url;
- m_user = _T("");
- m_password = _T("");
+ if(m_path.empty())
+ fullPath += wxT("/");
+ else
+ fullPath += m_path;
- if (pos2 == -1)
- return TRUE;
+ if (HasQuery())
+ fullPath += wxT("?") + m_query;
- temp_url = temp_url(0, pos2);
- pos2 = temp_url.Find(_T(':'));
+ if (HasFragment())
+ fullPath += wxT("#") + m_fragment;
- if (pos2 == -1)
- return FALSE;
+ wxInputStream *the_i_stream = m_protocol->GetInputStream(fullPath);
- m_user = temp_url(0, pos2);
- m_password = temp_url(pos2+1, url.Length());
+ if (!the_i_stream)
+ {
+ m_error = wxURL_PROTOERR;
+ return NULL;
+ }
- return TRUE;
+ return the_i_stream;
}
-bool wxURL::PrepPath(wxString& url)
+#if wxUSE_PROTOCOL_HTTP
+void wxURL::SetDefaultProxy(const wxString& url_proxy)
{
- if (url.Length() != 0)
- m_path = ConvertToValidURI(url);
- else
- m_path = _T("/");
- return TRUE;
+ 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
+ }
}
-bool wxURL::FetchProtocol()
+void wxURL::SetProxy(const wxString& url_proxy)
{
- wxProtoInfo *info = g_protocols;
-
- while (info) {
- if (m_protoname == info->m_protoname) {
- if (m_servname.IsNull())
- m_servname = info->m_servname;
+ if ( !url_proxy )
+ {
+ if ( m_proxy && m_proxy != ms_proxyDefault )
+ {
+ m_proxy->Close();
+ delete m_proxy;
+ }
- m_protoinfo = info;
- m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
- return TRUE;
+ 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 == wxNOT_FOUND)
+ return;
+
+ hostname = tmp_str(0, pos);
+ port = tmp_str(pos+1, 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();
}
- info = info->next;
- }
- return FALSE;
}
+#endif // wxUSE_PROTOCOL_HTTP
-// --------------------------------------------------------------
-// --------- wxURL get ------------------------------------------
-// --------------------------------------------------------------
+// ----------------------------------------------------------------------
+// wxURLModule
+//
+// A module which deletes the default proxy if we created it
+// ----------------------------------------------------------------------
+
+#if wxUSE_SOCKETS
-wxInputStream *wxURL::GetInputStream(void)
+class wxURLModule : public wxModule
{
- wxInputStream *the_i_stream = NULL;
+public:
+ virtual bool OnInit();
+ virtual void OnExit();
- if (!m_protocol) {
- m_error = wxURL_NOPROTO;
- return NULL;
- }
+private:
+ DECLARE_DYNAMIC_CLASS(wxURLModule)
+};
- m_error = wxURL_NOERR;
- if (m_user != _T("")) {
- m_protocol->SetUser(m_user);
- m_protocol->SetPassword(m_password);
- }
+IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
-#if wxUSE_SOCKETS
- wxIPV4address addr;
+bool wxURLModule::OnInit()
+{
+#if wxUSE_PROTOCOL_HTTP
+ // 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)
- // 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;
+ if ( wxGetenv(_T("HTTP_PROXY")) )
+ {
+ wxURL::ms_useDefaultProxy = true;
}
+#endif // wxUSE_PROTOCOL_HTTP
+ return true;
+}
- addr.Service(m_servname);
+void wxURLModule::OnExit()
+{
+#if wxUSE_PROTOCOL_HTTP
+ delete wxURL::ms_proxyDefault;
+ wxURL::ms_proxyDefault = NULL;
+#endif // wxUSE_PROTOCOL_HTTP
+}
- if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
- {
- m_error = wxURL_CONNERR;
- return NULL;
- }
- }
-#endif
+#endif // wxUSE_SOCKETS
- // 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);
+// ---------------------------------------------------------------------------
+//
+// wxURL Compatibility
+//
+// ---------------------------------------------------------------------------
- if (!the_i_stream) {
- m_error = wxURL_PROTOERR;
- return NULL;
- }
+#if WXWIN_COMPATIBILITY_2_4
- return the_i_stream;
-}
+#include "wx/url.h"
-#if wxUSE_SOCKETS
-void wxURL::SetDefaultProxy(const wxString& url_proxy)
+wxString wxURL::GetProtocolName() const
{
- if (url_proxy.IsNull()) {
- g_proxy->Close();
- delete g_proxy;
- g_proxy = NULL;
- return;
- }
-
- 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
+ return m_scheme;
}
-void wxURL::SetProxy(const wxString& url_proxy)
+wxString wxURL::GetHostName() const
{
- if (url_proxy.IsNull()) {
- if (m_proxy) {
- m_proxy->Close();
- delete m_proxy;
- }
- m_useProxy = FALSE;
- return;
- }
+ return m_server;
+}
- 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
-
- CleanData();
- // Reparse url.
- m_useProxy = TRUE;
- ParseURL();
+wxString wxURL::GetPath() const
+{
+ return m_path;
}
-#endif
-wxString wxURL::ConvertToValidURI(const wxString& uri)
+//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++) {
+ for (i = 0; i < uri.Len(); i++)
+ {
wxChar c = uri.GetChar(i);
- if (c == _T(' '))
- out_str += _T('+');
- else {
- if (!isalpha(c) && c != _T('.') && c != _T('+') && c != _T('/')) {
- hexa_code.Printf(_T("%%%02X"), c);
+ 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
+ }
+ else
+ {
out_str += c;
+ }
}
}
wxString wxURL::ConvertFromURI(const wxString& uri)
{
- wxString new_uri;
-
- size_t i = 0;
- while (i<uri.Len()) {
- int code;
- if (uri[i] == _T('%')) {
- i++;
- if (uri[i] >= _T('A') && uri[i] <= _T('F'))
- code = (uri[i] - _T('A') + 10) * 16;
- else
- code = (uri[i] - _T('0')) * 16;
- i++;
- if (uri[i] >= _T('A') && uri[i] <= _T('F'))
- code += (uri[i] - _T('A')) + 10;
- else
- code += (uri[i] - _T('0'));
- i++;
- new_uri += (wxChar)code;
- continue;
- }
- new_uri += uri[i];
- i++;
- }
- return new_uri;
+ return wxURI::Unescape(uri);
}
+
+#endif //WXWIN_COMPATIBILITY_2_4
+
+#endif // wxUSE_URL
projects / wxWidgets.git / blobdiff