X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..a339970ac4e4c5b8928cdfcc8908499714516fea:/src/common/url.cpp?ds=sidebyside

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 813ac542e5..b6c54cca45 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -23,21 +23,21 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <wx/string.h>
-#include <wx/list.h>
-#include <wx/utils.h>
-#include <wx/url.h>
+#include "wx/string.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/module.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;
+wxProtoInfo *wxURL::ms_protocols = NULL;
 
 #if wxUSE_SOCKETS
-wxHTTP *wxURL::g_proxy = NULL;
+    wxHTTP *wxURL::ms_proxyDefault = NULL;
+    bool wxURL::ms_useDefaultProxy = FALSE;
 #endif
 
 // --------------------------------------------------------------
@@ -50,49 +50,67 @@ wxHTTP *wxURL::g_proxy = NULL;
 
 wxURL::wxURL(const wxString& url)
 {
-  m_protocol = NULL;
-  m_error = wxURL_NOERR;
-  m_url = 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();
+    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;
     }
@@ -100,7 +118,8 @@ bool wxURL::ParseURL()
   // URL parse finished.
 
 #if wxUSE_SOCKETS
-  if (m_useProxy) {
+  if (m_useProxy)
+  {
     // We destroy the newly created protocol.
     CleanData();
 
@@ -132,7 +151,7 @@ wxURL::~wxURL()
 {
   CleanData();
 #if wxUSE_SOCKETS
-  if (m_proxy && m_proxy != g_proxy)
+  if (m_proxy && m_proxy != ms_proxyDefault)
     delete m_proxy;
 #endif
 }
@@ -162,7 +181,7 @@ 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());
@@ -179,7 +198,8 @@ bool wxURL::PrepHost(wxString& url)
 
   // Retrieve service number
   pos2 = temp_url.Find(wxT(':'), TRUE);
-  if (pos2 != -1 && pos2 < pos) {
+  if (pos2 != -1 && pos2 < pos)
+  {
     m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())
       return FALSE;
@@ -220,10 +240,12 @@ bool wxURL::PrepPath(wxString& url)
 
 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;
 
@@ -240,17 +262,19 @@ bool wxURL::FetchProtocol()
 // --------- wxURL get ------------------------------------------
 // --------------------------------------------------------------
 
-wxInputStream *wxURL::GetInputStream(void)
+wxInputStream *wxURL::GetInputStream()
 {
   wxInputStream *the_i_stream = NULL;
 
-  if (!m_protocol) {
+  if (!m_protocol)
+  {
     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;
-  if (m_user != wxT("")) {
+  if (m_user != wxT(""))
+  {
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
@@ -259,8 +283,10 @@ wxInputStream *wxURL::GetInputStream(void)
     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;
     }
@@ -281,7 +307,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;
   }
@@ -292,93 +319,124 @@ wxInputStream *wxURL::GetInputStream(void)
 #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(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 (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(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 != 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
+#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<uri.Len();i++) {
+  for (i = 0; i < uri.Len(); i++)
+  {
     wxChar c = uri.GetChar(i);
 
     if (c == wxT(' '))
-      out_str += wxT('+');
-    else {
-      if (!isalpha(c) && c != wxT('.') && c != wxT('+') && 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;
+      }
     }
   }
 
@@ -390,19 +448,23 @@ wxString wxURL::ConvertFromURI(const wxString& uri)
   wxString new_uri;
 
   size_t i = 0;
-  while (i<uri.Len()) {
+  while (i < uri.Len())
+  {
     int code;
-    if (uri[i] == wxT('%')) {
+    if (uri[i] == wxT('%'))
+    {
       i++;
       if (uri[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;
@@ -412,3 +474,44 @@ wxString wxURL::ConvertFromURI(const wxString& uri)
   }
   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