Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-08 23:42:06 +00:00
parent 21d734041a
commit c3a1c7d272
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/fs_inet.cpp
View File

@@ -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) bool wxInternetFSHandler::CanOpen(const wxString& location)
{ {
wxString p = GetProtocol(location); wxString p = GetProtocol(location);
if ((p == wxT("http")) || (p == wxT("ftp"))) 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); return (url.GetError() == wxURL_NOERR);
} }
else else
@@ -82,17 +101,7 @@ bool wxInternetFSHandler::CanOpen(const wxString& location)
wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
{ {
wxString myloc(GetRightLocation(location)); wxString right = GetProtocol(location) + wxT(":") + StripProtocolAnchor(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;
wxInputStream *s; wxInputStream *s;
wxString content; wxString content;
wxInetCacheNode *info; wxInetCacheNode *info;