1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QHttp: Don't reorder content-length header for no reason

Browse Source 
If the user supplied a content-length, and we also know the size of the payload
then we would set the content-length again, which is a remove + add on a QList.

This is completely avoidable if we are setting the same size anyway.

Fixes: QTBUG-102495
Change-Id: If62739cadb453dbda4c21e858ba3a17baaf71fb4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2022-04-19 16:30:14 +02:00
parent 3962a194d9
commit e2a1329910
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/access/qhttpnetworkconnection.cpp
View File

@ -265,8 +265,9 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
const qint64 contentLength = request.contentLength(); const qint64 contentLength = request.contentLength();
const qint64 uploadDeviceSize = uploadByteDevice->size(); const qint64 uploadDeviceSize = uploadByteDevice->size();
if (contentLength != -1 && uploadDeviceSize != -1) { if (contentLength != -1 && uploadDeviceSize != -1) {
// both values known, take the smaller one. // Both values known: use the smaller one.
request.setContentLength(qMin(uploadDeviceSize, contentLength)); if (uploadDeviceSize < contentLength)
request.setContentLength(uploadDeviceSize);
} else if (contentLength == -1 && uploadDeviceSize != -1) { } else if (contentLength == -1 && uploadDeviceSize != -1) {
// content length not supplied by user, but the upload device knows it // content length not supplied by user, but the upload device knows it
request.setContentLength(uploadDeviceSize); request.setContentLength(uploadDeviceSize);