added (and documented) msw.xp-tab-ok option

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 6c0da6ee2921fbbee52720e73a2ff240b7b36b68..2c30bffffcc3964e23b67718fa1ae3b2802bdc86 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -32,7 +32,7 @@
 #include <ctype.h>
 
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 #include <ctype.h>
 
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)

-IMPLEMENT_CLASS(wxURL, wxObject)
+IMPLEMENT_CLASS(wxURL, wxURI)

 
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;
 
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;


@@ -45,18 +45,32 @@ USE_PROTOCOL(wxHTTP)
 USE_PROTOCOL(wxFTP)
 
     wxHTTP *wxURL::ms_proxyDefault = NULL;
 USE_PROTOCOL(wxFTP)
 
     wxHTTP *wxURL::ms_proxyDefault = NULL;

-    bool wxURL::ms_useDefaultProxy = FALSE;
+    bool wxURL::ms_useDefaultProxy = false;

 #endif
 
 // --------------------------------------------------------------
 #endif
 
 // --------------------------------------------------------------

-// wxURL
+//
+//                          wxURL
+//

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 
 // --------------------------------------------------------------

-// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// Construction

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 

-wxURL::wxURL(const wxString& url)
+wxURL::wxURL(const wxString& url) : wxURI(url)
+{
+    Init(url);
+    ParseURL();
+}
+
+wxURL::wxURL(const wxURI& url) : wxURI(url)
+{
+    Init(url.BuildURI());
+    ParseURL();
+}
+
+void wxURL::Init(const wxString& url)

 {
     m_protocol = NULL;
     m_error = wxURL_NOERR;
 {
     m_protocol = NULL;
     m_error = wxURL_NOERR;


@@ -73,7 +87,7 @@ wxURL::wxURL(const wxString& url)
         if ( !ms_proxyDefault )
         {
             // don't try again
         if ( !ms_proxyDefault )
         {
             // don't try again

-            ms_useDefaultProxy = FALSE;
+            ms_useDefaultProxy = false;

         }
     }
 
         }
     }
 


@@ -81,65 +95,77 @@ wxURL::wxURL(const wxString& url)
     m_proxy = ms_proxyDefault;
 #endif // wxUSE_SOCKETS
 
     m_proxy = ms_proxyDefault;
 #endif // wxUSE_SOCKETS
 

+}
+
+// --------------------------------------------------------------
+// Assignment
+// --------------------------------------------------------------
+
+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();
     ParseURL();

+    return *this;

 }
 
 }
 

+// --------------------------------------------------------------
+// ParseURL
+//
+// Builds the URL and takes care of the old protocol stuff
+// --------------------------------------------------------------
+

 bool wxURL::ParseURL()
 {
 bool wxURL::ParseURL()
 {

-  wxString last_url = m_url;
-

   // If the URL was already parsed (m_protocol != NULL), pass this section.
   if (!m_protocol)
   {
     // Clean up
     CleanData();
 
   // 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))
+    // Make sure we have a protocol/scheme
+    if (!HasScheme())

     {
       m_error = wxURL_SNTXERR;
     {
       m_error = wxURL_SNTXERR;

-      return FALSE;
+      return false;

     }
 
     // Find and create the protocol object
     if (!FetchProtocol())
     {
       m_error = wxURL_NOPROTO;
     }
 
     // Find and create the protocol object
     if (!FetchProtocol())
     {
       m_error = wxURL_NOPROTO;

-      return FALSE;
+      return false;

     }
 
     // Do we need a host name ?
     if (m_protoinfo->m_needhost)
     {
     }
 
     // Do we need a host name ?
     if (m_protoinfo->m_needhost)
     {

-      // Extract it
-      if (!PrepHost(last_url))
+      //  Make sure we have one, then
+      if (!HasServer())

       {
         m_error = wxURL_SNTXERR;
       {
         m_error = wxURL_SNTXERR;

-        return FALSE;
+        return false;

       }
     }
       }
     }

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

   }
   }

-  // URL parse finished.

 
 #if wxUSE_SOCKETS
   if (m_useProxy)
   {
 
 #if wxUSE_SOCKETS
   if (m_useProxy)
   {

-    // We destroy the newly created protocol.
-    CleanData();
+    // destroy the previously created protocol as we'll be using m_proxy
+    delete m_protocol;

 
     // Third, we rebuild the URL.
 
     // Third, we rebuild the URL.

-    m_url = m_protoname + wxT(":");
+    m_url = m_scheme + wxT(":");

     if (m_protoinfo->m_needhost)
     if (m_protoinfo->m_needhost)

-      m_url = m_url + wxT("//") + m_hostname;
-
-    m_url += m_path;
+      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


@@ -147,9 +173,13 @@ bool wxURL::ParseURL()
 #endif
 
   m_error = wxURL_NOERR;
 #endif
 
   m_error = wxURL_NOERR;

-  return TRUE;
+  return true;

 }
 
 }
 

+// --------------------------------------------------------------
+// Destruction/Cleanup
+// --------------------------------------------------------------
+

 void wxURL::CleanData()
 {
 #if wxUSE_SOCKETS
 void wxURL::CleanData()
 {
 #if wxUSE_SOCKETS


@@ -171,109 +201,30 @@ wxURL::~wxURL()
 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------

-// --------- wxURL urls decoders --------------------------------
+// FetchProtocol

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 

-bool wxURL::PrepProto(wxString& url)
-{
-  int pos;
-
-  // Find end
-  pos = url.Find(wxT(':'));
-  if (pos == -1)
-    return FALSE;
-
-  m_protoname = url(0, pos);
-
-  url = url(pos+1, url.Length());
-
-  return TRUE;
-}
-
-bool wxURL::PrepHost(wxString& url)
-{
-  wxString temp_url;
-  int pos, pos2;
-
-  if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))
-    return FALSE;
-
-  url = url(2, url.Length());
-
-  pos = url.Find(wxT('/'));
-  if (pos == -1)
-    pos = url.Length();
-
-  if (pos == 0)
-    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)
-  {
-    m_servname = temp_url(pos2+1, pos);
-    if (!m_servname.IsNumber())
-      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.
-  m_hostname = temp_url(pos2+1, temp_url.Length());
-
-  m_user = wxT("");
-  m_password = wxT("");
-
-  if (pos2 == -1)
-    return TRUE;
-
-  temp_url = temp_url(0, pos2);
-  pos2 = temp_url.Find(wxT(':'));
-
-  if (pos2 == -1)
-    return FALSE;
-
-  m_user = temp_url(0, pos2);
-  m_password = temp_url(pos2+1, url.Length());
-
-  return TRUE;
-}
-
-bool wxURL::PrepPath(wxString& url)
-{
-  if (url.Length() != 0)
-    m_path = ConvertToValidURI(url);
-  else
-    m_path = wxT("/");
-  return TRUE;
-}
-

 bool wxURL::FetchProtocol()
 {
   wxProtoInfo *info = ms_protocols;
 
   while (info)
   {
 bool wxURL::FetchProtocol()
 {
   wxProtoInfo *info = ms_protocols;
 
   while (info)
   {

-    if (m_protoname == info->m_protoname)
+    if (m_scheme == 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;
+        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 ------------------------------------------
+// GetInputStream

 // --------------------------------------------------------------
 
 wxInputStream *wxURL::GetInputStream()
 // --------------------------------------------------------------
 
 wxInputStream *wxURL::GetInputStream()


@@ -285,10 +236,17 @@ wxInputStream *wxURL::GetInputStream()
   }
 
   m_error = wxURL_NOERR;
   }
 
   m_error = wxURL_NOERR;

-  if (m_user != wxT(""))
+  if (HasUser())

   {
   {

-    m_protocol->SetUser(m_user);
-    m_protocol->SetPassword(m_password);
+      size_t dwPasswordPos = m_user.find(':');
+
+      if (dwPasswordPos == wxString::npos)
+          m_protocol->SetUser(m_user);
+      else
+      {
+          m_protocol->SetUser(m_user(0, dwPasswordPos));
+          m_protocol->SetPassword(m_user(dwPasswordPos+1, m_user.length() + 1));
+      }

   }
 
 #if wxUSE_URL_NATIVE
   }
 
 #if wxUSE_URL_NATIVE


@@ -310,15 +268,15 @@ wxInputStream *wxURL::GetInputStream()
   // m_protoinfo is NULL when we use a proxy
   if (!m_useProxy && m_protoinfo->m_needhost)
   {
   // m_protoinfo is NULL when we use a proxy
   if (!m_useProxy && m_protoinfo->m_needhost)
   {

-    if (!addr.Hostname(m_hostname))
+    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, 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;
     {
       m_error = wxURL_CONNERR;
       return NULL;


@@ -327,9 +285,24 @@ wxInputStream *wxURL::GetInputStream()
 #endif
 
   // When we use a proxy, we have to pass the whole URL to it.
 #endif
 
   // When we use a proxy, we have to pass the whole URL to it.

-  wxInputStream *the_i_stream = 
-       (m_useProxy) ? m_protocol->GetInputStream(m_url) :
-                      m_protocol->GetInputStream(m_path);
+  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)
   {
 
   if (!the_i_stream)
   {


@@ -356,7 +329,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   {
       wxString tmp_str = url_proxy;
       int pos = tmp_str.Find(wxT(':'));
   {
       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),
           return;
 
       wxString hostname = tmp_str(0, pos),


@@ -373,7 +346,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
           ms_proxyDefault->Close();
       else
           ms_proxyDefault = new wxHTTP();
           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

   }
 }
 
   }
 }
 


@@ -387,7 +360,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             delete m_proxy;
         }
 
             delete m_proxy;
         }
 

-        m_useProxy = FALSE;
+        m_useProxy = false;

     }
     else
     {
     }
     else
     {


@@ -399,7 +372,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
         tmp_str = url_proxy;
         pos = tmp_str.Find(wxT(':'));
         // This is an invalid proxy name.
         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);
             return;
 
         hostname = tmp_str(0, pos);


@@ -412,98 +385,19 @@ void wxURL::SetProxy(const wxString& url_proxy)
         if (m_proxy && m_proxy != ms_proxyDefault)
             delete m_proxy;
         m_proxy = new wxHTTP();
         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.
 
         CleanData();
         // Reparse url.

-        m_useProxy = TRUE;
+        m_useProxy = true;

         ParseURL();
     }
 }
 #endif // wxUSE_SOCKETS
 
         ParseURL();
     }
 }
 #endif // wxUSE_SOCKETS
 

-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)
-{
-  wxString new_uri;
-
-  size_t i = 0;
-  while (i < uri.Len())
-  {
-    int code;
-    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;
-    }
-    new_uri += uri[i];
-    i++;
-  }
-  return new_uri;
-}
-

 // ----------------------------------------------------------------------
 // ----------------------------------------------------------------------

+// wxURLModule
+//

 // A module which deletes the default proxy if we created it
 // ----------------------------------------------------------------------
 
 // A module which deletes the default proxy if we created it
 // ----------------------------------------------------------------------
 


@@ -530,10 +424,10 @@ bool wxURLModule::OnInit()
 
     if ( getenv("HTTP_PROXY") )
     {
 
     if ( getenv("HTTP_PROXY") )
     {

-        wxURL::ms_useDefaultProxy = TRUE;
+        wxURL::ms_useDefaultProxy = true;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxURLModule::OnExit()
 }
 
 void wxURLModule::OnExit()