diff options
| author | Peter Hartmann <phartmann@blackberry.com> | 2013-10-25 08:56:01 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 08:47:45 (GMT) |
| commit | 87b2b0226b5fef964fd6898e30124a33c3ecec11 (patch) | |
| tree | 2e63876ed0012e8d6f7ab15efbe3a5d3b9c5df28 | |
| parent | da616ffa54f22f3334f555ea0bdffe9521145b0b (diff) | |
| download | Qt-87b2b0226b5fef964fd6898e30124a33c3ecec11.zip Qt-87b2b0226b5fef964fd6898e30124a33c3ecec11.tar.gz Qt-87b2b0226b5fef964fd6898e30124a33c3ecec11.tar.bz2 | |
network: fix multi-phased NTLM authentication
tested manually with internal NTLM proxy.
Patch-by: Jonathan Lauvernier <Jonathan.Lauvernier@gmail.com>
(cherry picked from commit 338da730e8bc23e227e26b094cba6bb6233c42de)
Change-Id: I889056545b60deccf55053c2b41ecb1ea0cba62d
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index b4a9c31..4d8fb16 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -176,7 +176,7 @@ QAuthenticator &QAuthenticator::operator=(const QAuthenticator &other) d->realm = other.d->realm; d->method = other.d->method; d->options = other.d->options; - } else { + } else if (d->phase == QAuthenticatorPrivate::Start) { delete d; d = 0; } @@ -250,7 +250,8 @@ void QAuthenticator::detach() return; } - d->phase = QAuthenticatorPrivate::Start; + if (d->phase == QAuthenticatorPrivate::Done) + d->phase = QAuthenticatorPrivate::Start; } /*! |