From a30decc01878ab2435a9a48f4963c07b5e08c5b6 Mon Sep 17 00:00:00 2001
From: Adrian Constantin <adrian.constantin@nokia.com>
Date: Thu, 7 Apr 2011 10:39:49 +0300
Subject: Revert "Remove SIGBUS emission from QNetworkSession destruction."

This reverts commit b40d04a19f4c186bf47aad128b0618c629629e07.

Reviewed-by: Shane Kearns
    It is usual for QXyzPrivate implementation to assume
    that the parent QXyz is a valid object.

Reviewed-by: Cristiano di Flora
---
 src/network/bearer/qnetworksession.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 2613bf8..9503553 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -260,7 +260,7 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration& connectionConfig,
 */
 QNetworkSession::~QNetworkSession()
 {
-    d->deleteLater();
+    delete d;
 }
 
 /*!
-- 
cgit v0.12


From 3f7d1dd5f323970f1047ab058159ec48d94012f7 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Mon, 28 Mar 2011 17:53:45 +0100
Subject: Ensure shared network session deleted from correct thread

Due to threaded http, the shared QNetworkSession can have its last
reference removed from a http delegate thread. To avoid this deadlocking
use a deleteLater custom deleter so that the QNS is deleted from the
thread it has affinity for.

Reviewed-by: Markus Goetz
Task-Number: QTBUG-17464
---
 src/network/bearer/qsharednetworksession.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/network/bearer/qsharednetworksession.cpp b/src/network/bearer/qsharednetworksession.cpp
index 28ca173..fcb0128 100644
--- a/src/network/bearer/qsharednetworksession.cpp
+++ b/src/network/bearer/qsharednetworksession.cpp
@@ -59,6 +59,11 @@ inline QSharedNetworkSessionManager* sharedNetworkSessionManager()
     return rv;
 }
 
+static void doDeleteLater(QObject* obj)
+{
+    obj->deleteLater();
+}
+
 QSharedPointer<QNetworkSession> QSharedNetworkSessionManager::getSession(QNetworkConfiguration config)
 {
     QSharedNetworkSessionManager *m(sharedNetworkSessionManager());
@@ -69,7 +74,7 @@ QSharedPointer<QNetworkSession> QSharedNetworkSessionManager::getSession(QNetwor
             return p;
     }
     //otherwise make one
-    QSharedPointer<QNetworkSession> session(new QNetworkSession(config));
+    QSharedPointer<QNetworkSession> session(new QNetworkSession(config), doDeleteLater);
     m->sessions[config] = session;
     return session;
 }
-- 
cgit v0.12