Applied patch for ArtProvider.

[wxWidgets.git] / src / common / url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 39ad2b6d93fa979f4b2a480478a9d3ea27c8dad3..dfd818b17602e88edfa6e0b990c0cb963e204292 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -6,221 +6,306 @@
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "url.h"
 #endif
 #pragma implementation "url.h"
 #endif

-#include <string.h>
-#include <ctype.h>
-
-// wxWindows headers
-#include <wx/string.h>
-#include <wx/list.h>
-#include <wx/utils.h>

 
 

-// wxSocket header
-#include "wx/url.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxProtoInfo, wxObject)
-IMPLEMENT_CLASS(wxURL, wxObject)
-#endif
-
-// Protocols list
-wxProtoInfo *wxURL::g_protocols = NULL;
-wxHTTP wxURL::g_proxy;
+#if wxUSE_URL

 
 

-/////////////////////////////////////////////////////////////////
-// wxURL ////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
+#include "wx/string.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/module.h"
+#include "wx/url.h"

 
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
- * --------------------------------------------------------------
- */
+#include <string.h>
+#include <ctype.h>

 
 

-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;
-}
+IMPLEMENT_CLASS(wxProtoInfo, wxObject)
+IMPLEMENT_CLASS(wxURL, wxURI)

 
 

-bool wxURL::ParseURL()
-{
-  wxString last_url = m_url;
+// Protocols list
+wxProtoInfo *wxURL::ms_protocols = NULL;

 
 

-  // Clean up
-  CleanData();
+// Enforce linking of protocol classes:
+USE_PROTOCOL(wxFileProto)

 
 

-  // Extract protocol name
-  if (!PrepProto(last_url)) {
-    m_error = wxURL_SNTXERR;
-    return FALSE;
-  }
+#if wxUSE_PROTOCOL_HTTP
+USE_PROTOCOL(wxHTTP)

 
 

-  // Find and create the protocol object
-  if (!FetchProtocol()) {
-    m_error = wxURL_NOPROTO;
-    return FALSE;
-  }
+    wxHTTP *wxURL::ms_proxyDefault = NULL;
+    bool wxURL::ms_useDefaultProxy = false;
+#endif

 
 

-  // Do we need a host name ?
-  if (m_protoinfo->m_needhost) {
-    // Extract it
-    if (!PrepHost(last_url)) {
-      m_error = wxURL_SNTXERR;
-      return FALSE;
-    }
-  }
+#if wxUSE_PROTOCOL_FTP
+USE_PROTOCOL(wxFTP)
+#endif

 
 

-  // Extract full path
-  if (!PrepPath(last_url)) {
-    m_error = wxURL_NOPATH;
-    return FALSE;
-  }
+// --------------------------------------------------------------
+//
+//                          wxURL
+//
+// --------------------------------------------------------------

 
 

-  m_error = wxURL_NOERR;
-  return TRUE;
-}
+// --------------------------------------------------------------
+// Construction
+// --------------------------------------------------------------

 
 

-void wxURL::CleanData()
+wxURL::wxURL(const wxString& url) : wxURI(url)

 {
 {

-  if (m_protoname != "proxy")
-    delete m_protocol;
+    Init(url);
+    ParseURL();

 }
 
 }
 

-wxURL::~wxURL()
+wxURL::wxURL(const wxURI& url) : wxURI(url)

 {
 {

-  CleanData();
+    Init(url.BuildURI());
+    ParseURL();

 }
 
 }
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL urls decoders --------------------------------
- * --------------------------------------------------------------
- */
-bool wxURL::PrepProto(wxString& url)
+void wxURL::Init(const wxString& url)

 {
 {

-  int pos;
+    m_protocol = NULL;
+    m_error = wxURL_NOERR;
+    m_url = url;
+#if wxUSE_URL_NATIVE
+    m_nativeImp = CreateNativeImpObject();
+#endif

 
 

-  // Find end
-  pos = url.Find(':');
-  if (pos == -1)
-    return FALSE;
+#if wxUSE_PROTOCOL_HTTP
+    if ( ms_useDefaultProxy && !ms_proxyDefault )
+    {
+        SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );

 
 

-  m_protoname = url(0, pos);
+        if ( !ms_proxyDefault )
+        {
+            // don't try again
+            ms_useDefaultProxy = false;
+        }
+    }

 
 

-  url = url(pos+1, url.Length());
+    m_useProxy = ms_proxyDefault != NULL;
+    m_proxy = ms_proxyDefault;
+#endif // wxUSE_PROTOCOL_HTTP

 
 

-  return TRUE;

 }
 
 }
 

-bool wxURL::PrepHost(wxString& url)
+// --------------------------------------------------------------
+// Assignment
+// --------------------------------------------------------------
+
+wxURL& wxURL::operator = (const wxURI& url)

 {
 {

-  int pos, pos2;
+    wxURI::operator = (url);
+    Init(url.BuildURI());
+    ParseURL();
+    return *this;
+}
+wxURL& wxURL::operator = (const wxString& url)
+{
+    wxURI::operator = (url);
+    Init(url);
+    ParseURL();
+    return *this;
+}

 
 

-  if ((url[0UL] != '/') || (url[1UL] != '/'))
-    return FALSE;
+// --------------------------------------------------------------
+// ParseURL
+//
+// Builds the URL and takes care of the old protocol stuff
+// --------------------------------------------------------------

 
 

-  url = url(2, url.Length());
+bool wxURL::ParseURL()
+{
+  // If the URL was already parsed (m_protocol != NULL), pass this section.
+  if (!m_protocol)
+  {
+    // Clean up
+    CleanData();

 
 

-  pos = url.Find('/');
-  if (pos == -1)
-    return FALSE;
+    // Make sure we have a protocol/scheme
+    if (!HasScheme())
+    {
+      m_error = wxURL_SNTXERR;
+      return false;
+    }

 
 

-  pos2 = url.Find(':');
-  if (pos2 != -1 && pos2 < pos) {
-    m_servname = url(pos2, pos);
-    if (!m_servname.IsNumber())
-      return FALSE;
-    pos2 = pos;
+    // 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;
+      }
+    }

   }
 
   }
 

-  m_hostname = url(0, pos);
+#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;

 
 

-  url = url(url.Find('/'), url.Length());
+    // We initialize specific variables.
+    m_protocol = m_proxy; // FIXME: we should clone the protocol
+  }
+#endif // wxUSE_PROTOCOL_HTTP

 
 

-  return TRUE;
+  m_error = wxURL_NOERR;
+  return true;

 }
 
 }
 

-bool wxURL::PrepPath(wxString& url)
+// --------------------------------------------------------------
+// Destruction/Cleanup
+// --------------------------------------------------------------
+
+void wxURL::CleanData()

 {
 {

-  if (url.Length() != 0)
-    m_path = url;
-  else
-    m_path = "/";
-  return TRUE;
+#if wxUSE_PROTOCOL_HTTP
+  if (!m_useProxy)
+#endif // wxUSE_PROTOCOL_HTTP
+    delete m_protocol;

 }
 
 }
 

-bool wxURL::FetchProtocol()
+wxURL::~wxURL()

 {
 {

-  wxProtoInfo *info = g_protocols;
+    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
+}

 
 

-  while (info) {
-    if (m_protoname == info->m_protoname) {
-      if (m_servname.IsNull())
-        m_servname = info->m_servname;
+// --------------------------------------------------------------
+// FetchProtocol
+// --------------------------------------------------------------

 
 

-      m_protoinfo = info;
-      m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
-      wxSocketHandler::Master().Register(m_protocol);
-      return TRUE;
+bool wxURL::FetchProtocol()
+{
+  wxProtoInfo *info = ms_protocols;
+
+  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;
   }
     }
     info = info->next;
   }

-  return FALSE;
+  return false;

 }
 
 }
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL get ------------------------------------------
- * --------------------------------------------------------------
- */
-wxInputStream *wxURL::GetInputStream(void)
-{
-  wxIPV4address addr;
-  wxInputStream *the_i_stream = NULL;
+// --------------------------------------------------------------
+// GetInputStream
+// --------------------------------------------------------------

 
 

+wxInputStream *wxURL::GetInputStream()
+{

   if (!m_protocol)
   if (!m_protocol)

-    if (!ParseURL())
-      return NULL;
-
-  if (!m_protocol) {
+  {

     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;
     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;

-  if (m_protoinfo->m_needhost) {
-    if (!addr.Hostname(m_hostname)) {
+  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 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 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_error = wxURL_NOHOST;
       return NULL;
     }
 
       m_error = wxURL_NOHOST;
       return NULL;
     }
 

-    addr.Service(m_servname);
+    addr.Service(m_port);

 
 

-    if (!m_protocol->Connect(addr)) {
+    if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason
+    {

       m_error = wxURL_CONNERR;
       return NULL;
     }
   }
       m_error = wxURL_CONNERR;
       return NULL;
     }
   }

+#endif

 
 

-  the_i_stream = m_protocol->GetInputStream(m_path);
-  if (!the_i_stream) {
+  // 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);
+  }
+
+  if (!the_i_stream)
+  {

     m_error = wxURL_PROTOERR;
     return NULL;
   }
     m_error = wxURL_PROTOERR;
     return NULL;
   }


@@ -228,50 +313,133 @@ wxInputStream *wxURL::GetInputStream(void)
   return the_i_stream;
 }
 
   return the_i_stream;
 }
 

+#if wxUSE_PROTOCOL_HTTP

 void wxURL::SetDefaultProxy(const wxString& url_proxy)
 {
 void wxURL::SetDefaultProxy(const wxString& url_proxy)
 {

-  g_proxy.Close();
-
-  if (url_proxy.IsNull())
-    return;
-
-  wxString tmp_str = url_proxy;
-  int pos = tmp_str.Find(':');
-  wxString hostname = tmp_str(0, pos),
-           port = tmp_str(pos, tmp_str.Length()-pos);
-  wxIPV4address addr;
-
-  addr.Hostname(hostname);
-  addr.Service(port);
-  
-  g_proxy.Connect(addr);
+  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)
 {
 }
 
 void wxURL::SetProxy(const wxString& url_proxy)
 {

-  if (url_proxy.IsNull()) {
-    m_proxy.Close();
-    return;
-  }
+    if ( !url_proxy )
+    {
+        if ( m_proxy && m_proxy != ms_proxyDefault )
+        {
+            m_proxy->Close();
+            delete m_proxy;
+        }
+
+        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();
+    }
+}
+#endif // wxUSE_PROTOCOL_HTTP

 
 

-  CleanData();
+// ----------------------------------------------------------------------
+// wxURLModule
+//
+// A module which deletes the default proxy if we created it
+// ----------------------------------------------------------------------

 
 

-  wxString tmp_str;
-  wxString hostname, port;
-  int pos;
-  wxIPV4address addr;
+#if wxUSE_SOCKETS

 
 

-  tmp_str = url_proxy;
-  pos = tmp_str.Find(':');
-  hostname = tmp_str(0, pos);
-  port = tmp_str(pos, tmp_str.Length()-pos);
+class wxURLModule : public wxModule
+{
+public:
+    virtual bool OnInit();
+    virtual void OnExit();

 
 

-  addr.Hostname(hostname);
-  addr.Service(port);
+private:
+    DECLARE_DYNAMIC_CLASS(wxURLModule)
+};

 
 

-  m_proxy.Connect(addr);
+IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)

 
 

-  m_protocol = &m_proxy;
-  m_protoname = "proxy";
-  m_path = url_proxy;
+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)
+
+    if ( wxGetenv(_T("HTTP_PROXY")) )
+    {
+        wxURL::ms_useDefaultProxy = true;
+    }
+#endif // wxUSE_PROTOCOL_HTTP
+    return true;

 }
 }

+
+void wxURLModule::OnExit()
+{
+#if wxUSE_PROTOCOL_HTTP
+    delete wxURL::ms_proxyDefault;
+    wxURL::ms_proxyDefault = NULL;
+#endif // wxUSE_PROTOCOL_HTTP
+}
+
+#endif // wxUSE_SOCKETS
+
+#endif // wxUSE_URL
+