github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #10468 from Chocobo1/backport

Browse source 
Backport recent PRs to v4_1_x
This commit is contained in:
Mike Tzou 2019-04-10 16:50:19 +08:00 • committed by GitHub
commit 383a5f11bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/base/http/requestparser.cpp
View file

@ -203,7 +203,10 @@ bool RequestParser::parsePostMessage(const QByteArray &data)
// application/x-www-form-urlencoded // application/x-www-form-urlencoded
if (contentTypeLower.startsWith(CONTENT_TYPE_FORM_ENCODED)) { if (contentTypeLower.startsWith(CONTENT_TYPE_FORM_ENCODED)) {
QListIterator<QStringPair> i(QUrlQuery(data).queryItems(QUrl::FullyDecoded)); // [URL Standard] 5.1 application/x-www-form-urlencoded parsing
const QByteArray processedData = QByteArray(data).replace('+', ' ');
QListIterator<QStringPair> i(QUrlQuery(processedData).queryItems(QUrl::FullyDecoded));
while (i.hasNext()) { while (i.hasNext()) {
const QStringPair pair = i.next(); const QStringPair pair = i.next();
m_request.posts[pair.first] = pair.second; m_request.posts[pair.first] = pair.second;

15
src/webui/api/synccontroller.cpp
View file

@ -29,8 +29,8 @@
#include "synccontroller.h" #include "synccontroller.h"
#include <QJsonObject> #include <QJsonObject>
#include <QMetaObject>
#include <QThread> #include <QThread>
#include <QTimer>
#include "base/bittorrent/peerinfo.h" #include "base/bittorrent/peerinfo.h"
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
@ -330,7 +330,7 @@ SyncController::SyncController(ISessionManager *sessionManager, QObject *parent)
connect(m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::checked, this, &SyncController::freeDiskSpaceSizeUpdated); connect(m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::checked, this, &SyncController::freeDiskSpaceSizeUpdated);
m_freeDiskSpaceThread->start(); m_freeDiskSpaceThread->start();
QTimer::singleShot(0, m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::check); invokeChecker();
m_freeDiskSpaceElapsedTimer.start(); m_freeDiskSpaceElapsedTimer.start();
} }
@ -516,7 +516,7 @@ void SyncController::torrentPeersAction()
qint64 SyncController::getFreeDiskSpace() qint64 SyncController::getFreeDiskSpace()
{ {
if (m_freeDiskSpaceElapsedTimer.hasExpired(FREEDISKSPACE_CHECK_TIMEOUT)) { if (m_freeDiskSpaceElapsedTimer.hasExpired(FREEDISKSPACE_CHECK_TIMEOUT)) {
QTimer::singleShot(0, m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::check); invokeChecker();
m_freeDiskSpaceElapsedTimer.restart(); m_freeDiskSpaceElapsedTimer.restart();
} }
@ -527,3 +527,12 @@ void SyncController::freeDiskSpaceSizeUpdated(qint64 freeSpaceSize)
{ {
m_freeDiskSpace = freeSpaceSize; m_freeDiskSpace = freeSpaceSize;
} }
void SyncController::invokeChecker() const
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
QMetaObject::invokeMethod(m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::check, Qt::QueuedConnection);
#else
QMetaObject::invokeMethod(m_freeDiskSpaceChecker, "check", Qt::QueuedConnection);
#endif
}

1
src/webui/api/synccontroller.h
View file

@ -56,6 +56,7 @@ private slots:
private: private:
qint64 getFreeDiskSpace(); qint64 getFreeDiskSpace();
void invokeChecker() const;
qint64 m_freeDiskSpace = 0; qint64 m_freeDiskSpace = 0;
FreeDiskSpaceChecker *m_freeDiskSpaceChecker = nullptr; FreeDiskSpaceChecker *m_freeDiskSpaceChecker = nullptr;