diff options
| author | Martin Petersson <martin.petersson@nokia.com> | 2011-02-22 16:12:40 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-22 17:18:15 (GMT) |
| commit | b7667461ca80613d018f2258b54b5d1f9195e50d (patch) | |
| tree | 7022369b7f3c94331dcbc091b98fd5ca215a71a6 /src/network/socket | |
| parent | 7f41f062e05c02ddf31ab6b81444f57904614f2a (diff) | |
| download | Qt-b7667461ca80613d018f2258b54b5d1f9195e50d.zip Qt-b7667461ca80613d018f2258b54b5d1f9195e50d.tar.gz Qt-b7667461ca80613d018f2258b54b5d1f9195e50d.tar.bz2 | |
tst_qnetworkreply: Fix httpProxyCommands() on Windows.
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 4e628f3..6a025f2 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -743,7 +743,10 @@ void QHttpSocketEngine::emitReadNotification() { Q_D(QHttpSocketEngine); d->readNotificationActivated = true; - if (d->readNotificationEnabled && !d->readNotificationPending) { + // if there is a connection notification pending we have to emit the readNotification + // incase there is connection error. This is only needed for Windows, but it does not + // hurt in other cases. + if ((d->readNotificationEnabled && !d->readNotificationPending) || d->connectionNotificationPending) { d->readNotificationPending = true; QMetaObject::invokeMethod(this, "emitPendingReadNotification", Qt::QueuedConnection); } |