2 files changed, 11 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 4efb2f6a2a..511faca11d 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -428,6 +428,7 @@ QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
     , synchronous(false)
     , state(Idle)
     , statusCode(0)
+    , uploadDeviceChoking(false)
     , outgoingData(0)
     , bytesUploaded(-1)
     , cacheLoadDevice(0)
@@ -1291,9 +1292,12 @@ void QNetworkReplyHttpImplPrivate::wantUploadDataSlot(qint64 maxSize)
     char *data = const_cast<char*>(uploadByteDevice->readPointer(maxSize, currentUploadDataLength));
 
     if (currentUploadDataLength == 0) {
+        uploadDeviceChoking = true;
         // No bytes from upload byte device. There will be bytes later, it will emit readyRead()
         // and our uploadByteDeviceReadyReadSlot() is called.
         return;
+    } else {
+        uploadDeviceChoking = false;
     }
 
     // Let's make a copy of this data
@@ -1306,7 +1310,12 @@ void QNetworkReplyHttpImplPrivate::wantUploadDataSlot(qint64 maxSize)
 void QNetworkReplyHttpImplPrivate::uploadByteDeviceReadyReadSlot()
 {
     // Start the flow between this thread and the HTTP thread again by triggering a upload.
-    wantUploadDataSlot(1024);
+    // However only do this when we were choking before, else the state in
+    // QNonContiguousByteDeviceThreadForwardImpl gets messed up.
+    if (uploadDeviceChoking) {
+        uploadDeviceChoking = false;
+        wantUploadDataSlot(1024);
+    }
 }
 
 
diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h
index 06a5383ae4..4a5b61a227 100644
--- a/src/network/access/qnetworkreplyhttpimpl_p.h
+++ b/src/network/access/qnetworkreplyhttpimpl_p.h
@@ -212,6 +212,7 @@ public:
     // upload
     QNonContiguousByteDevice* createUploadByteDevice();
     QSharedPointer<QNonContiguousByteDevice> uploadByteDevice;
+    bool uploadDeviceChoking; // if we couldn't readPointer() any data at the moment
     QIODevice *outgoingData;
     QSharedPointer<QRingBuffer> outgoingDataBuffer;
     void emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal); // dup?