From 21f95b5254e411d35653e1047ab395edd12062da Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 27 Jan 2000 00:03:25 +0000 Subject: [PATCH] fixed incorrect parsing of URLs like www.kde.org (should be understood as www.kde.org/) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fs_inet.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index 6c2eeb52e2..53af80cad7 100644 --- 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; -- 2.50.0