Windy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-09 04:08:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix reply data can't be decompressed correctly

Browse Source 
If the "Accept-Encoding" is not manually specified, it will be
automatically set to the supported encodings by QT and the reply data
will also be automatically decompressed in this case. Setting
"Accept-Encoding" manually will disable the "autodecompress" feature
before QT 6.3.0. Although QT 6.3.x has different behaviors, let QT
specify the "Accept-Encoding" and we will always obtain the decompressed
data.

The macro "QT_NO_COMPRESS" defined when QT is compiled will disable
the zlib support. We can manually address this exceptions.

Original PR #17438.
This commit is contained in:
brvphoenix 2022-07-29 11:03:21 +08:00 committed by Chocobo1
parent b53eadaec8
commit 330f20171f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/base/net/downloadhandlerimpl.cpp
View File

@ -37,7 +37,7 @@
#include "base/utils/io.h"
#include "base/utils/misc.h"
#if (QT_VERSION < QT_VERSION_CHECK(6, 3, 0))
#ifdef QT_NO_COMPRESS
#include "base/utils/gzip.h"
#endif
@ -124,12 +124,12 @@ void DownloadHandlerImpl::processFinishedDownload()
}
// Success
#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
m_result.data = m_reply->readAll();
#else
#ifdef QT_NO_COMPRESS
m_result.data = (m_reply->rawHeader("Content-Encoding") == "gzip")
? Utils::Gzip::decompress(m_reply->readAll())
: m_reply->readAll();
#else
m_result.data = m_reply->readAll();
#endif
if (m_downloadRequest.saveToFile())

6
src/base/net/downloadmanager.cpp
View File

@ -123,8 +123,12 @@ namespace
// Spoof HTTP Referer to allow adding torrent link from Torcache/KickAssTorrents
request.setRawHeader("Referer", request.url().toEncoded().data());
// Accept gzip
#ifdef QT_NO_COMPRESS
// The macro "QT_NO_COMPRESS" defined in QT will disable the zlib releated features
// and reply data auto-decompression in QT will also be disabled. But we can support
// gzip encoding and manually decompress the reply data.
request.setRawHeader("Accept-Encoding", "gzip");
#endif
// Qt doesn't support Magnet protocol so we need to handle redirections manually
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy);