diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-04 14:59:46 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-05 14:43:13 +0000 |
| commit | 60238fbf13449e31eeea3b6b09ae5fd799083e76 (patch) | |
| tree | 17edb372d51683ac9cc5fb0be116546534005d35 /src/core/download_manager_delegate_qt.cpp | |
| parent | 1fde91789de573683eaf1d6b1294eba7757ce11b (diff) | |
Fallback to Latin-1 if ASCII and UTF-8 doesn't work
Latin-1 is a standard fallback for HTTP headers, but no one that
HTTPContentDisposition::Parse considers by default.
Task-number: QTBUG-70288
Change-Id: Ife36fffe31da5492cde49a4d447cfc42b3f64b95
Reviewed-by: Zakor Tamas <ztamas@inf.u-szeged.hu>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/download_manager_delegate_qt.cpp')
| -rw-r--r-- | src/core/download_manager_delegate_qt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index 4ed77688e..9fe233577 100644 --- a/src/core/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp @@ -43,6 +43,7 @@ #include "content/public/browser/download_manager.h" #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_contents.h" +#include "net/base/net_string_util.h" #include "net/http/http_content_disposition.h" #include <QDir> @@ -136,7 +137,7 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem* } if (suggestedFilename.isEmpty()) - suggestedFilename = toQt(net::HttpContentDisposition(item->GetContentDisposition(), std::string()).filename()); + suggestedFilename = toQt(net::HttpContentDisposition(item->GetContentDisposition(), net::kCharsetLatin1).filename()); if (suggestedFilename.isEmpty()) suggestedFilename = toQt(item->GetTargetFilePath().AsUTF8Unsafe()); |