diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-09 12:38:07 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-09 12:38:19 +0200 |
| commit | 6a56fd306937552dbeb53b30149288dc83d2c90b (patch) | |
| tree | 2ac21aa1a1862df01cdf5724514c268b6093717b /src/network | |
| parent | c98943b4cd1c2c2007a9be19a0cfbe8739ab8ccb (diff) | |
| parent | 88083a81590c6ac9b9fad88725386e4629fc3d08 (diff) | |
Merge branch 'release' into stable
Change-Id: I5e94c4f01564df633c9925561ebb0b553bd31a2e
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpmultipart.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp index 4397ef8205..5985ed94e0 100644 --- a/src/network/access/qhttpmultipart.cpp +++ b/src/network/access/qhttpmultipart.cpp @@ -497,7 +497,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) // skip the parts we have already read while (index < multiPart->parts.count() && - readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) + readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() + + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart index++; // read the data |