X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21f95b5254e411d35653e1047ab395edd12062da..f5ba273ecd799f652736ce2bc830283787302a56:/src/common/fs_inet.cpp?ds=inline

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 53af80cad7..d3b94f258d 100644
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -34,7 +34,7 @@ limitation)
     #define wxUSE_FS_INET 0
 #endif
 
-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -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[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;
@@ -137,7 +146,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
                             right,
                             info->GetMime(),
                             GetAnchor(location),
-                            wxDateTime::Today());
+                            wxDateTime::Now());
     }
     else return (wxFSFile*) NULL;
 }
@@ -173,4 +182,4 @@ class wxFileSystemInternetModule : public wxModule
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET