fixing osx_cocoa

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index cbe5866c76ee9705d5afd6e5feef10ae8f3feb94..15b9311839e476a852c5975c9cf8670264912b7f 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        url.cpp
+// Name:        src/common/url.cpp

 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -9,30 +9,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "url.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_URL
 
 #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 "wx/url.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
+#endif
+

 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #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;


@@ -40,23 +38,46 @@ wxProtoInfo *wxURL::ms_protocols = NULL;
 // Enforce linking of protocol classes:
 USE_PROTOCOL(wxFileProto)
 
 // Enforce linking of protocol classes:
 USE_PROTOCOL(wxFileProto)
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

 USE_PROTOCOL(wxHTTP)
 USE_PROTOCOL(wxHTTP)

-USE_PROTOCOL(wxFTP)

 
     wxHTTP *wxURL::ms_proxyDefault = NULL;
     bool wxURL::ms_useDefaultProxy = false;
 #endif
 
 
     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)
+{
+    Init(url);
+    ParseURL();
+}
+
+wxURL::wxURL(const wxURI& uri) : wxURI(uri)
+{
+    Init(uri.BuildURI());
+    ParseURL();
+}
+
+wxURL::wxURL(const wxURL& url) : wxURI(url)
+{
+    Init(url.GetURL());
+    ParseURL();
+}
+
+void wxURL::Init(const wxString& url)

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


@@ -65,7 +86,7 @@ wxURL::wxURL(const wxString& url)
     m_nativeImp = CreateNativeImpObject();
 #endif
 
     m_nativeImp = CreateNativeImpObject();
 #endif
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {
         SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {
         SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );


@@ -79,302 +100,297 @@ wxURL::wxURL(const wxString& url)
 
     m_useProxy = ms_proxyDefault != NULL;
     m_proxy = ms_proxyDefault;
 
     m_useProxy = ms_proxyDefault != NULL;
     m_proxy = ms_proxyDefault;

-#endif // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP

 
 

-    ParseURL();

 }
 
 }
 

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

 {
 {

-  wxString last_url = m_url;
+    wxURI::operator = (url);
+    Free();
+    Init(url);
+    ParseURL();

 
 

-  // If the URL was already parsed (m_protocol != NULL), pass this section.
-  if (!m_protocol)
-  {
-    // Clean up
-    CleanData();
+    return *this;
+}

 
 

-    // Extract protocol name
-    if (!PrepProto(last_url))
+wxURL& wxURL::operator = (const wxURI& uri)
+{
+    if (&uri != this)

     {
     {

-      m_error = wxURL_SNTXERR;
-      return false;
+        wxURI::operator = (uri);
+        Free();
+        Init(uri.BuildURI());
+        ParseURL();

     }
 
     }
 

-    // Find and create the protocol object
-    if (!FetchProtocol())
-    {
-      m_error = wxURL_NOPROTO;
-      return false;
-    }
+    return *this;
+}

 
 

-    // Do we need a host name ?
-    if (m_protoinfo->m_needhost)
+wxURL& wxURL::operator = (const wxURL& url)
+{
+    if (&url != this)

     {
     {

-      // Extract it
-      if (!PrepHost(last_url))
-      {
-        m_error = wxURL_SNTXERR;
-        return false;
-      }
+        wxURI::operator = (url);
+        Free();
+        Init(url.GetURL());
+        ParseURL();

     }
 
     }
 

-    // Extract full path
-    if (!PrepPath(last_url))
+    return *this;
+}
+
+// --------------------------------------------------------------
+// ParseURL
+//
+// Builds the URL and takes care of the old protocol stuff
+// --------------------------------------------------------------
+
+bool wxURL::ParseURL()
+{
+    // If the URL was already parsed (m_protocol != NULL), pass this section.
+    if (!m_protocol)

     {
     {

-      m_error = wxURL_NOPATH;
-      return false;
-    }
-  }
-  // URL parse finished.
+        // Clean up
+        CleanData();

 
 

-#if wxUSE_SOCKETS
-  if (m_useProxy)
-  {
-    // destroy the previously created protocol as we'll be using m_proxy
-    delete m_protocol;
+        // Make sure we have a protocol/scheme
+        if (!HasScheme())
+        {
+            m_error = wxURL_SNTXERR;
+            return false;
+        }

 
 

-    // Third, we rebuild the URL.
-    m_url = m_protoname + wxT(":");
-    if (m_protoinfo->m_needhost)
-      m_url = m_url + wxT("//") + m_hostname;
+        // Find and create the protocol object
+        if (!FetchProtocol())
+        {
+            m_error = wxURL_NOPROTO;
+            return false;
+        }

 
 

-    m_url += m_path;
+        // 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.
+        if (m_protocol)
+            m_protocol->Destroy();
+        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()
 {
 void wxURL::CleanData()
 {

-#if wxUSE_SOCKETS
-  if (!m_useProxy)
-#endif
-    delete m_protocol;
+#if wxUSE_PROTOCOL_HTTP
+    if (!m_useProxy)
+#endif // wxUSE_PROTOCOL_HTTP
+    {
+        if (m_protocol)
+        {
+            // Need to safely delete the socket (pending events)
+            m_protocol->Destroy();
+            m_protocol = NULL;
+        }
+    }

 }
 
 }
 

-wxURL::~wxURL()
+void wxURL::Free()

 {
     CleanData();
 {
     CleanData();

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

     if (m_proxy && m_proxy != ms_proxyDefault)
         delete m_proxy;
     if (m_proxy && m_proxy != ms_proxyDefault)
         delete m_proxy;

-#endif
+#endif // wxUSE_PROTOCOL_HTTP

 #if wxUSE_URL_NATIVE
     delete m_nativeImp;
 #endif
 }
 
 #if wxUSE_URL_NATIVE
     delete m_nativeImp;
 #endif
 }
 

-// --------------------------------------------------------------
-// --------- wxURL urls decoders --------------------------------
-// --------------------------------------------------------------
-
-bool wxURL::PrepProto(wxString& url)
-{
-  int pos;
-
-  // Find end
-  pos = url.Find(wxT(':'));
-  if (pos == wxNOT_FOUND)
-    return false;
-
-  m_protoname = url(0, pos);
-
-  url = url(pos+1, url.Length());
-
-  return true;
-}
-
-bool wxURL::PrepHost(wxString& url)
+wxURL::~wxURL()

 {
 {

-  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 == wxNOT_FOUND)
-    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 != wxNOT_FOUND && 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 wxNOT_FOUND, this code is right.
-  m_hostname = temp_url(pos2+1, temp_url.Length());
-
-  m_user = wxT("");
-  m_password = wxT("");
-
-  if (pos2 == wxNOT_FOUND)
-    return true;
-
-  temp_url = temp_url(0, pos2);
-  pos2 = temp_url.Find(wxT(':'));
-
-  if (pos2 == wxNOT_FOUND)
-    return false;
-
-  m_user = temp_url(0, pos2);
-  m_password = temp_url(pos2+1, url.Length());
-
-  return true;
+    Free();

 }
 
 }
 

-bool wxURL::PrepPath(wxString& url)
-{
-  if (url.Length() != 0)
-    m_path = ConvertToValidURI(url);
-  else
-    m_path = wxT("/");
-  return true;
-}
+// --------------------------------------------------------------
+// FetchProtocol
+// --------------------------------------------------------------

 
 bool wxURL::FetchProtocol()
 {
 
 bool wxURL::FetchProtocol()
 {

-  wxProtoInfo *info = ms_protocols;
+    wxProtoInfo *info = ms_protocols;

 
 

-  while (info)
-  {
-    if (m_protoname == info->m_protoname)
+    while (info)

     {
     {

-      if (m_servname.IsNull())
-        m_servname = info->m_servname;
-
-      m_protoinfo = info;
-      m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
-      return true;
+        if (m_scheme == info->m_protoname)
+        {
+            if ( m_port.empty() )
+                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()
 {

-  if (!m_protocol)
-  {
-    m_error = wxURL_NOPROTO;
-    return NULL;
-  }
-
-  m_error = wxURL_NOERR;
-  if (m_user != wxT(""))
-  {
-    m_protocol->SetUser(m_user);
-    m_protocol->SetPassword(m_password);
-  }
+    if (!m_protocol)
+    {
+        m_error = wxURL_NOPROTO;
+        return NULL;
+    }
+
+    m_error = wxURL_NOERR;
+    if (HasUserInfo())
+    {
+        size_t dwPasswordPos = m_userinfo.find(':');
+
+        if (dwPasswordPos == wxString::npos)
+            m_protocol->SetUser(Unescape(m_userinfo));
+        else
+        {
+            m_protocol->SetUser(Unescape(m_userinfo(0, dwPasswordPos)));
+            m_protocol->SetPassword(Unescape(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1)));
+        }
+    }

 
 #if wxUSE_URL_NATIVE
 
 #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
+    // 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;
 
 #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))
+    // m_protoinfo is NULL when we use a proxy
+    if (
+#if wxUSE_PROTOCOL_HTTP
+         !m_useProxy &&
+#endif // wxUSE_PROTOCOL_HTTP
+         m_protoinfo->m_needhost )

     {
     {

-      m_error = wxURL_NOHOST;
-      return NULL;
-    }
+        if (!addr.Hostname(m_server))
+        {
+            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
-    {
-      m_error = wxURL_CONNERR;
-      return NULL;
+        if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason
+        {
+            m_error = wxURL_CONNERR;
+            return NULL;
+        }

     }
     }

-  }
-#endif
+#endif // wxUSE_SOCKETS
+
+    wxString fullPath;
+
+#if wxUSE_PROTOCOL_HTTP
+    // When we use a proxy, we have to pass the whole URL to it.
+    if (m_useProxy)
+        fullPath += m_url;
+#endif // wxUSE_PROTOCOL_HTTP
+
+    if(m_path.empty())
+        fullPath += wxT("/");
+    else
+        fullPath += m_path;
+
+    if (HasQuery())
+        fullPath += wxT("?") + m_query;
+
+    if (HasFragment())
+        fullPath += wxT("#") + m_fragment;

 
 

-  // 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 = m_protocol->GetInputStream(fullPath);

 
 

-  if (!the_i_stream)
-  {
-    m_error = wxURL_PROTOERR;
-    return NULL;
-  }
+    if (!the_i_stream)
+    {
+        m_error = wxURL_PROTOERR;
+        return NULL;
+    }

 
 

-  return the_i_stream;
+    return the_i_stream;

 }
 
 }
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

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

-  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
-  }
+    if ( !url_proxy )
+    {
+        if ( ms_proxyDefault )
+        {
+            ms_proxyDefault->Close();
+            wxDELETE(ms_proxyDefault);
+        }
+    }
+    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)


@@ -403,7 +419,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             return;
 
         hostname = tmp_str(0, pos);
             return;
 
         hostname = tmp_str(0, pos);

-        port = tmp_str(pos+1, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.length()-pos);

 
         addr.Hostname(hostname);
         addr.Service(port);
 
         addr.Hostname(hostname);
         addr.Service(port);


@@ -420,9 +436,11 @@ void wxURL::SetProxy(const wxString& url_proxy)
         ParseURL();
     }
 }
         ParseURL();
     }
 }

-#endif // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP

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

+// wxURLModule
+//

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


@@ -431,6 +449,8 @@ void wxURL::SetProxy(const wxString& url_proxy)
 class wxURLModule : public wxModule
 {
 public:
 class wxURLModule : public wxModule
 {
 public:

+    wxURLModule();
+

     virtual bool OnInit();
     virtual void OnExit();
 
     virtual bool OnInit();
     virtual void OnExit();
 


@@ -440,28 +460,37 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 

+wxURLModule::wxURLModule()
+{
+    // we must be cleaned up before wxSocketModule as otherwise deleting
+    // ms_proxyDefault from our OnExit() won't work (and can actually crash)
+    AddDependency(wxClassInfo::FindClass(wxT("wxSocketModule")));
+}
+

 bool wxURLModule::OnInit()
 {
 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)
 
     // 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") )
+    if ( wxGetenv(wxT("HTTP_PROXY")) )

     {
         wxURL::ms_useDefaultProxy = true;
     }
     {
         wxURL::ms_useDefaultProxy = true;
     }

-
+#endif // wxUSE_PROTOCOL_HTTP

     return true;
 }
 
 void wxURLModule::OnExit()
 {
     return true;
 }
 
 void wxURLModule::OnExit()
 {

-    delete wxURL::ms_proxyDefault;
-    wxURL::ms_proxyDefault = NULL;
+#if wxUSE_PROTOCOL_HTTP
+    wxDELETE(wxURL::ms_proxyDefault);
+#endif // wxUSE_PROTOCOL_HTTP

 }
 
 #endif // wxUSE_SOCKETS
 
 }
 
 #endif // wxUSE_SOCKETS
 

-#endif // wxUSE_URL

 
 

+#endif // wxUSE_URL