diff options
| author | Martin Petersson <martin.petersson@nokia.com> | 2011-02-22 16:12:40 (GMT) |
|---|---|---|
| committer | Martin Petersson <martin.petersson@nokia.com> | 2011-02-22 16:15:24 (GMT) |
| commit | 9741b5c067496e24fbf37395e954003d0803c72e (patch) | |
| tree | 93d086fdbd868582b01f6e30554c170c1636a8eb /src/network/socket/qhttpsocketengine.cpp | |
| parent | dd09b490167de72296517fb5e5f271f3d8b4a57a (diff) | |
| download | Qt-9741b5c067496e24fbf37395e954003d0803c72e.zip Qt-9741b5c067496e24fbf37395e954003d0803c72e.tar.gz Qt-9741b5c067496e24fbf37395e954003d0803c72e.tar.bz2 | |
tst_qnetworkreply: Fix httpProxyCommands() on Windows.
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
| -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); } |