Revert "QNam: only init channels when needed."

This reverts commit ff25691d00d634068c6389f8f1607d7cc95ac5be.

The change broke qtdeclarative. Several autotests crash because
QHttpNetworkConnection::transparentProxy() calls proxy() on a
null socket.

Task-number: QTBUG-24717
Change-Id: I57e3ccf5d20683f59cf7450083d1fcb3fa1c40fe
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

1 files changed, 2 insertions, 65 deletions

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index a009222bd5..3991bffa47 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
 QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
     : socket(0)
     , ssl(false)
-    , isInitialized(false)
     , state(IdleState)
     , reply(0)
     , written(0)
@@ -153,38 +152,19 @@ void QHttpNetworkConnectionChannel::init()
         QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
                          this, SLOT(_q_encryptedBytesWritten(qint64)),
                          Qt::DirectConnection);
-
-        if (ignoreAllSslErrors)
-            sslSocket->ignoreSslErrors();
-
-        if (!ignoreSslErrorsList.isEmpty())
-            sslSocket->ignoreSslErrors(ignoreSslErrorsList);
-
-        if (!sslConfiguration.isNull())
-           sslSocket->setSslConfiguration(sslConfiguration);
     }
-
 #endif
-
-#ifndef QT_NO_NETWORKPROXY
-    if (proxy.type() != QNetworkProxy::NoProxy)
-        socket->setProxy(proxy);
-#endif
-    isInitialized = true;
 }
 
 
 void QHttpNetworkConnectionChannel::close()
 {
-    if (!socket)
-        state = QHttpNetworkConnectionChannel::IdleState;
-    else if (socket->state() == QAbstractSocket::UnconnectedState)
+    if (socket->state() == QAbstractSocket::UnconnectedState)
         state = QHttpNetworkConnectionChannel::IdleState;
     else
         state = QHttpNetworkConnectionChannel::ClosingState;
 
-    if (socket)
-        socket->close();
+    socket->close();
 }
 
 
@@ -547,9 +527,6 @@ void QHttpNetworkConnectionChannel::handleUnexpectedEOF()
 
 bool QHttpNetworkConnectionChannel::ensureConnection()
 {
-    if (!isInitialized)
-        init();
-
     QAbstractSocket::SocketState socketState = socket->state();
 
     // resend this request after we receive the disconnected signal
@@ -858,46 +835,6 @@ bool QHttpNetworkConnectionChannel::resetUploadData()
     }
 }
 
-#ifndef QT_NO_NETWORKPROXY
-
-void QHttpNetworkConnectionChannel::setProxy(const QNetworkProxy &networkProxy)
-{
-    if (socket)
-        socket->setProxy(networkProxy);
-
-    proxy = networkProxy;
-}
-
-#endif
-
-#ifndef QT_NO_SSL
-
-void QHttpNetworkConnectionChannel::ignoreSslErrors()
-{
-    if (socket)
-        static_cast<QSslSocket *>(socket)->ignoreSslErrors();
-
-    ignoreAllSslErrors = true;
-}
-
-
-void QHttpNetworkConnectionChannel::ignoreSslErrors(const QList<QSslError> &errors)
-{
-    if (socket)
-        static_cast<QSslSocket *>(socket)->ignoreSslErrors(errors);
-
-    ignoreSslErrorsList = errors;
-}
-
-void QHttpNetworkConnectionChannel::setSslConfiguration(const QSslConfiguration &config)
-{
-    if (socket)
-        static_cast<QSslSocket *>(socket)->setSslConfiguration(config);
-
-    sslConfiguration = config;
-}
-
-#endif
 
 void QHttpNetworkConnectionChannel::pipelineInto(HttpMessagePair &pair)
 {