fixed incorrect parsing of http://domain.com:portnumber/

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 8d295d4677376326b449a754f0dd0003f0f5c295..05bf75c3486c06ef5217b36229fe837e56356c52 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -67,12 +67,31 @@ class wxInetCacheNode : public wxObject
 //--------------------------------------------------------------------------------
 
 
+static wxString StripProtocolAnchor(const wxString& location)
+{
+    wxString myloc(location.BeforeLast(wxT('#')));
+    if (myloc.IsEmpty()) myloc = location.AfterFirst(wxT(':'));
+    else myloc = myloc.AfterFirst(wxT(':'));
+
+    // fix malformed url:
+    if (myloc.Left(2) != wxT("//")) 
+    {
+        if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
+        else myloc = wxT("/") + myloc;
+    }
+    if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/');
+
+    return myloc;
+}
+
+
+
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
     if ((p == wxT("http")) || (p == wxT("ftp"))) 
     {
-        wxURL url(GetProtocol(location) + wxT(":") + GetRightLocation(location));
+        wxURL url(p + wxT(":") + StripProtocolAnchor(location));
         return (url.GetError() == wxURL_NOERR);
     }
     else 
@@ -82,17 +101,7 @@ bool wxInternetFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
-    wxString myloc(GetRightLocation(location));
-    
-    // fix malformed url:
-    if (myloc.Left(2) != wxT("//")) 
-    {
-        if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
-        else myloc = wxT("/") + myloc;
-    }
-    if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/');
-
-    wxString right = GetProtocol(location) + wxT(":") + myloc;
+    wxString right = GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;