X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c092213d52eeb0e98b7635116b8405b29dfe5de6..4c420a80e0fb11511b235411875ba5d3e0eb8492:/src/common/url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index cce9ae5701..9e02d03dca 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -6,10 +6,10 @@
 // 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
 
@@ -20,8 +20,7 @@
 #pragma hdrstop
 #endif
 
-#include <string.h>
-#include <ctype.h>
+#if wxUSE_URL
 
 #include "wx/string.h"
 #include "wx/list.h"
@@ -29,15 +28,24 @@
 #include "wx/module.h"
 #include "wx/url.h"
 
+#include <string.h>
+#include <ctype.h>
+
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
 
 // Protocols list
 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;
+    bool wxURL::ms_useDefaultProxy = false;
 #endif
 
 // --------------------------------------------------------------
@@ -53,16 +61,19 @@ wxURL::wxURL(const wxString& url)
     m_protocol = NULL;
     m_error = wxURL_NOERR;
     m_url = url;
+#if wxUSE_URL_NATIVE
+    m_nativeImp = CreateNativeImpObject();
+#endif
 
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {
-        SetDefaultProxy(getenv("HTTP_PROXY"));
+        SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
 
         if ( !ms_proxyDefault )
         {
             // don't try again
-            ms_useDefaultProxy = FALSE;
+            ms_useDefaultProxy = false;
         }
     }
 
@@ -77,45 +88,51 @@ 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;
+      return false;
     }
 
     // Find and create the protocol object
-    if (!FetchProtocol()) {
+    if (!FetchProtocol())
+    {
       m_error = wxURL_NOPROTO;
-      return FALSE;
+      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;
+        return false;
       }
     }
 
     // Extract full path
-    if (!PrepPath(last_url)) {
+    if (!PrepPath(last_url))
+    {
       m_error = wxURL_NOPATH;
-      return FALSE;
+      return false;
     }
   }
   // URL parse finished.
 
 #if wxUSE_SOCKETS
-  if (m_useProxy) {
-    // We destroy the newly created protocol.
-    CleanData();
+  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_protoname + wxT(":");
@@ -130,7 +147,7 @@ bool wxURL::ParseURL()
 #endif
 
   m_error = wxURL_NOERR;
-  return TRUE;
+  return true;
 }
 
 void wxURL::CleanData()
@@ -143,10 +160,13 @@ void wxURL::CleanData()
 
 wxURL::~wxURL()
 {
-  CleanData();
+    CleanData();
 #if wxUSE_SOCKETS
-  if (m_proxy && m_proxy != ms_proxyDefault)
-    delete m_proxy;
+    if (m_proxy && m_proxy != ms_proxyDefault)
+        delete m_proxy;
+#endif
+#if wxUSE_URL_NATIVE
+    delete m_nativeImp;
 #endif
 }
 
@@ -160,14 +180,14 @@ bool wxURL::PrepProto(wxString& url)
 
   // Find end
   pos = url.Find(wxT(':'));
-  if (pos == -1)
-    return FALSE;
+  if (pos == wxNOT_FOUND)
+    return false;
 
   m_protoname = url(0, pos);
 
   url = url(pos+1, url.Length());
 
-  return TRUE;
+  return true;
 }
 
 bool wxURL::PrepHost(wxString& url)
@@ -176,50 +196,51 @@ bool wxURL::PrepHost(wxString& url)
   int pos, pos2;
 
   if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))
-    return FALSE;
+    return false;
 
   url = url(2, url.Length());
 
   pos = url.Find(wxT('/'));
-  if (pos == -1)
+  if (pos == wxNOT_FOUND)
     pos = url.Length();
 
   if (pos == 0)
-    return FALSE;
+    return false;
 
   temp_url = url(0, pos);
   url = url(url.Find(wxT('/')), url.Length());
 
   // Retrieve service number
-  pos2 = temp_url.Find(wxT(':'), TRUE);
-  if (pos2 != -1 && pos2 < pos) {
+  pos2 = temp_url.Find(wxT(':'), true);
+  if (pos2 != wxNOT_FOUND && pos2 < pos)
+  {
     m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())
-      return FALSE;
+      return false;
     temp_url = temp_url(0, pos2);
   }
 
   // Retrieve user and password.
   pos2 = temp_url.Find(wxT('@'));
-  // Even if pos2 equals -1, this code is right.
+  // Even if pos2 equals wxNOT_FOUND, this code is right.
   m_hostname = temp_url(pos2+1, temp_url.Length());
 
   m_user = wxT("");
   m_password = wxT("");
 
-  if (pos2 == -1)
-    return TRUE;
+  if (pos2 == wxNOT_FOUND)
+    return true;
 
   temp_url = temp_url(0, pos2);
   pos2 = temp_url.Find(wxT(':'));
 
-  if (pos2 == -1)
-    return FALSE;
+  if (pos2 == wxNOT_FOUND)
+    return false;
 
   m_user = temp_url(0, pos2);
   m_password = temp_url(pos2+1, url.Length());
 
-  return TRUE;
+  return true;
 }
 
 bool wxURL::PrepPath(wxString& url)
@@ -228,25 +249,27 @@ bool wxURL::PrepPath(wxString& url)
     m_path = ConvertToValidURI(url);
   else
     m_path = wxT("/");
-  return TRUE;
+  return true;
 }
 
 bool wxURL::FetchProtocol()
 {
   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;
 
       m_protoinfo = info;
       m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
-      return TRUE;
+      return true;
     }
     info = info->next;
   }
-  return FALSE;
+  return false;
 }
 
 // --------------------------------------------------------------
@@ -255,32 +278,47 @@ bool wxURL::FetchProtocol()
 
 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);
   }
 
+#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_hostname)) {
+  if (!m_useProxy && m_protoinfo->m_needhost)
+  {
+    if (!addr.Hostname(m_hostname))
+    {
       m_error = wxURL_NOHOST;
       return NULL;
     }
 
     addr.Service(m_servname);
 
-    if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
+    if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason
     {
       m_error = wxURL_CONNERR;
       return NULL;
@@ -289,12 +327,12 @@ wxInputStream *wxURL::GetInputStream()
 #endif
 
   // 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);
+  wxInputStream *the_i_stream =
+       (m_useProxy) ? m_protocol->GetInputStream(m_url) :
+                      m_protocol->GetInputStream(m_path);
 
-  if (!the_i_stream) {
+  if (!the_i_stream)
+  {
     m_error = wxURL_PROTOERR;
     return NULL;
   }
@@ -318,7 +356,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   {
       wxString tmp_str = url_proxy;
       int pos = tmp_str.Find(wxT(':'));
-      if (pos == -1)
+      if (pos == wxNOT_FOUND)
           return;
 
       wxString hostname = tmp_str(0, pos),
@@ -335,7 +373,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
           ms_proxyDefault->Close();
       else
           ms_proxyDefault = new wxHTTP();
-      ms_proxyDefault->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
+      ms_proxyDefault->Connect(addr, true); // Watcom needs the 2nd arg for some reason
   }
 }
 
@@ -349,7 +387,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             delete m_proxy;
         }
 
-        m_useProxy = FALSE;
+        m_useProxy = false;
     }
     else
     {
@@ -361,11 +399,11 @@ void wxURL::SetProxy(const wxString& url_proxy)
         tmp_str = url_proxy;
         pos = tmp_str.Find(wxT(':'));
         // This is an invalid proxy name.
-        if (pos == -1)
+        if (pos == wxNOT_FOUND)
             return;
 
         hostname = tmp_str(0, pos);
-        port = tmp_str(pos, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.Length()-pos);
 
         addr.Hostname(hostname);
         addr.Service(port);
@@ -374,33 +412,55 @@ void wxURL::SetProxy(const wxString& url_proxy)
         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
+        m_proxy->Connect(addr, true); // Watcom needs the 2nd arg for some reason
 
         CleanData();
         // Reparse url.
-        m_useProxy = TRUE;
+        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<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;
+      }
     }
   }
 
@@ -412,19 +472,27 @@ 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 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 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;
@@ -459,12 +527,13 @@ bool wxURLModule::OnInit()
     // 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;
+        wxURL::ms_useDefaultProxy = true;
     }
 
-    return TRUE;
+    return true;
 }
 
 void wxURLModule::OnExit()
@@ -474,3 +543,6 @@ void wxURLModule::OnExit()
 }
 
 #endif // wxUSE_SOCKETS
+
+#endif // wxUSE_URL
+