Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

3 files changed, 4 insertions, 4 deletions

diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 64a22aa..7d49648 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -653,6 +653,7 @@ void QNetworkAccessHttpBackend::postRequest()
                      delegate->isPipeliningUsed,
                      QSharedPointer<char>(),
                      delegate->incomingContentLength);
+            replyDownloadData(delegate->synchronousDownloadData);
             httpError(delegate->incomingErrorCode, delegate->incomingErrorDetail);
         } else {
             replyDownloadMetaData
diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp
index edd5d6e..0aa5a5a 100644
--- a/src/network/socket/qsymbiansocketengine.cpp
+++ b/src/network/socket/qsymbiansocketengine.cpp
@@ -1037,7 +1037,7 @@ qint64 QSymbianSocketEngine::write(const char *data, qint64 len)
     TSockXfrLength sentBytes = 0;
     TRequestStatus status;
     d->nativeSocket.Send(buffer, 0, status, sentBytes);
-    User::WaitForRequest(status); //TODO: on emulator this blocks for write >16kB (non blocking IO not implemented properly?)
+    User::WaitForRequest(status);
     TInt err = status.Int(); 
 
     if (err) {
@@ -1204,7 +1204,7 @@ int QSymbianSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool
         const_cast<QSymbianSocketEnginePrivate*>(this)->setError(err);
         //restart asynchronous notifier (only one IOCTL allowed at a time)
         if (asyncSelect)
-            asyncSelect->IssueRequest(); //TODO: in error case should we restart or not?
+            asyncSelect->IssueRequest();
         return err;
     }
     if (checkRead && (selectFlags() & KSockSelectRead)) {
@@ -1324,7 +1324,7 @@ bool QSymbianSocketEnginePrivate::checkProxy(const QHostAddress &address)
     return true;
 }
 
-// FIXME this is also in QNativeSocketEngine, unify it
+// ### this is also in QNativeSocketEngine, unify it
 /*! \internal
 
     Sets the error and error string if not set already. The only
diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h
index 3b39096..aad6228 100644
--- a/src/network/socket/qsymbiansocketengine_p.h
+++ b/src/network/socket/qsymbiansocketengine_p.h
@@ -195,7 +195,6 @@ public:
 
     mutable QByteArray receivedDataBuffer;
     mutable bool hasReceivedBufferedDatagram;
-    // FIXME this is duplicated from qnativesocketengine_p.h
     enum ErrorString {
         NonBlockingInitFailedErrorString,
         BroadcastingInitFailedErrorString,