summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:13:38 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:13:38 +0200
commit533820320c30fca6028415321d1a3b937a261088 (patch)
tree1a0eebcc5f5729f5a9d2f00b080c5fcf1cd15c6f /src/network
parent25739bebba0343a8b35775a073c49f0fba080762 (diff)
parent172fa29dffef0eb55378f62b3ea1c18810639b3f (diff)
Merge remote-tracking branch 'origin/release' into stable
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qnetworkrequest.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 3a3e24b80b..00d5b81413 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -752,7 +752,8 @@ static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVaria
static QNetworkRequest::KnownHeaders parseHeaderName(const QByteArray &headerName)
{
- // headerName is not empty here
+ if (headerName.isEmpty())
+ return QNetworkRequest::KnownHeaders(-1);
switch (tolower(headerName.at(0))) {
case 'c':