fixed incorrect parsing of URLs like www.kde.org (should be understood as www.kde...

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 6c2eeb52e22ea43d8636312be6d209f48c3155ab..53af80cad706436f88f5e02604f4f73df8ec53e7 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -82,7 +82,17 @@ bool wxInternetFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
-    wxString right = GetProtocol(location) + wxT(":") + GetRightLocation(location);
+    wxString myloc(GetRightLocation(location));
+    
+    // fix malformed url:
+    if (myloc.Left(2) != wxT("//")) 
+    {
+        if (myloc[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;
     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;