Use Content-Disposition in GetSuggestedFileName()

src/common/webrequest.cpp

@@ -277,8 +277,20 @@ wxString wxWebResponse::GetSuggestedFileName() const
 {
     wxString suggestedFilename;
 
-    // TODO: get from Content-Disposition header
+    // Try to determine from Content-Disposition header
+    wxString contentDisp = GetHeader("Content-Disposition");
+    wxString disp;
+    wxWebRequestHeaderMap params;
+    wxWebRequest::SplitParameters(contentDisp, disp, params);
+    if ( disp == "attachment" )
+    {
+        // Parse as filename to filter potential path names
+        wxFileName fn(params["filename"]);
+        suggestedFilename = fn.GetFullName();
+    }
 
+    if ( suggestedFilename.empty() )
+    {
         wxURI uri(GetURL());
         if ( uri.HasPath() )
         {
@@ -287,6 +299,7 @@ wxString wxWebResponse::GetSuggestedFileName() const
         }
         else
             suggestedFilename = uri.GetServer();
+    }
 
     return suggestedFilename;
 }