From 45540361bb238ee2d83aad7fd95ac6700692a709 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 12 Mar 2010 08:32:04 +1000
Subject: Fix creation of QNetworkSession.

If QNAM::setConfiguration(QNetworkConfiguration()) is called before the
first network request is processed new session using the default
configuration would be incorrectly created.
---
 src/network/access/qnetworkaccessmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 7bb1399..789d57b 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -886,8 +886,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
             d->createSession(manager.defaultConfiguration());
         else
             d->createSession(manager.configurationFromIdentifier(d->networkConfiguration));
-
-        d->initializeSession = false;
     } else if (d->networkSession) {
         d->networkSession->setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), -1);
     }
@@ -1207,6 +1205,8 @@ void QNetworkAccessManagerPrivate::createSession(const QNetworkConfiguration &co
 {
     Q_Q(QNetworkAccessManager);
 
+    initializeSession = false;
+
     if (networkSession)
         delete networkSession;
 
-- 
cgit v0.12