diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-12-14 15:37:31 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-12-14 15:40:45 (GMT) |
| commit | adba8e01f0069d240bf0b97175f54e38271acd19 (patch) | |
| tree | 931bca315b778782273a0a10b98145ed1d2914aa /src/network | |
| parent | 0f18542566e72efc09a21c7f69927159d7ca2df5 (diff) | |
| download | Qt-adba8e01f0069d240bf0b97175f54e38271acd19.zip Qt-adba8e01f0069d240bf0b97175f54e38271acd19.tar.gz Qt-adba8e01f0069d240bf0b97175f54e38271acd19.tar.bz2 | |
QNAM Code: Do not re-abort or continue processing notifications.
This should finally enable us to use DirectConnection in
QNetworkReplyHandler of QtWebKit.
Reviewed-by: thiago
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index c20812e..1667c10 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -273,7 +273,7 @@ void QNetworkReplyImplPrivate::handleNotifications() if (state != Working) return; - while (!current.isEmpty()) { + while (state == Working && !current.isEmpty()) { InternalNotifications notification = current.dequeue(); switch (notification) { case NotifyDownstreamReadyWrite: @@ -580,7 +580,7 @@ QNetworkReplyImpl::~QNetworkReplyImpl() void QNetworkReplyImpl::abort() { Q_D(QNetworkReplyImpl); - if (d->state == QNetworkReplyImplPrivate::Aborted) + if (d->state == QNetworkReplyImplPrivate::Finished || d->state == QNetworkReplyImplPrivate::Aborted) return; // stop both upload and download |