diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-11-13 13:38:49 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-11-13 15:52:54 (GMT) |
| commit | 76055d4e4a3023ef6390d85a02688bb11df57284 (patch) | |
| tree | 6ae6e511c8a4fb5d547bea26c261ff1b49b16a07 /src/network/access/qnetworkrequest.cpp | |
| parent | 57ad39ec62175eeea023ca802448ebb1605dca23 (diff) | |
| download | Qt-76055d4e4a3023ef6390d85a02688bb11df57284.zip Qt-76055d4e4a3023ef6390d85a02688bb11df57284.tar.gz Qt-76055d4e4a3023ef6390d85a02688bb11df57284.tar.bz2 | |
QNAM HTTP: Ignore double content-length headers
Task-number: QTBUG-15311
Reviewed-by: ogoffart
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index b761af5..162392d 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -899,10 +899,16 @@ void QNetworkHeadersPrivate::parseAndSetHeader(const QByteArray &key, const QByt // is it a known header? QNetworkRequest::KnownHeaders parsedKey = parseHeaderName(key); if (parsedKey != QNetworkRequest::KnownHeaders(-1)) { - if (value.isNull()) + if (value.isNull()) { cookedHeaders.remove(parsedKey); - else + } else if (parsedKey == QNetworkRequest::ContentLengthHeader + && cookedHeaders.contains(QNetworkRequest::ContentLengthHeader)) { + // Only set the cooked header "Content-Length" once. + // See bug QTBUG-15311 + } else { cookedHeaders.insert(parsedKey, parseHeaderValue(parsedKey, value)); + } + } } |