summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorPeter Hartmann <phartmann@blackberry.com>2013-06-14 14:30:52 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-24 10:04:30 +0200
commit5defb3a36a3a9d71eaefd27a910b23b2fcd65c77 (patch)
treee75221e9ebffa0cd848b56923704078e05cda4bf /src/network
parent48345e5d3c07d6dca12dd4ccee18fa3e0ca0ebda (diff)
HTTP internals: fix QHttpNetworkRequestPrivate::operator==
We were not comparing all fields. Spotted-by: Richard J. Moore <rich@kde.org> Change-Id: I5c1a773b00b64a26606c47ced292808696c9b4bb Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qhttpnetworkrequest.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp
index f26559ce9b..d9f9b555d7 100644
--- a/src/network/access/qhttpnetworkrequest.cpp
+++ b/src/network/access/qhttpnetworkrequest.cpp
@@ -76,8 +76,14 @@ bool QHttpNetworkRequestPrivate::operator==(const QHttpNetworkRequestPrivate &ot
{
return QHttpNetworkHeaderPrivate::operator==(other)
&& (operation == other.operation)
- && (ssl == other.ssl)
+ && (priority == other.priority)
&& (uploadByteDevice == other.uploadByteDevice)
+ && (autoDecompress == other.autoDecompress)
+ && (pipeliningAllowed == other.pipeliningAllowed)
+ // we do not clear the customVerb in setOperation
+ && (operation != QHttpNetworkRequest::Custom || (customVerb == other.customVerb))
+ && (withCredentials == other.withCredentials)
+ && (ssl == other.ssl)
&& (preConnect == other.preConnect);
}