summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnectionchannel_p.h
diff options
context:
space:
mode:
authorMartin Petersson <Martin.Petersson@nokia.com>2012-03-01 10:36:38 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-13 10:11:22 +0100
commitc68737add39360040e5b0cd93f01f229d6a8bbc9 (patch)
treed062858c0a1700121c0799c463df6acb41c917b3 /src/network/access/qhttpnetworkconnectionchannel_p.h
parent8be558e99d69fbfda495882e1bda1c64585485a6 (diff)
QNam: only init channels when needed.
Each channel will create a socket that will allocate memory for the read and write buffers. This change will instead initialize channels only when they are needed. Change-Id: I112b4c7b944a7dd345414f06260c92803394eaed Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
-rw-r--r--src/network/access/qhttpnetworkconnectionchannel_p.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 7da9b514d6..2648cba2a5 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -72,6 +72,7 @@
#ifndef QT_NO_SSL
# include <QtNetwork/qsslsocket.h>
# include <QtNetwork/qsslerror.h>
+# include <QtNetwork/qsslconfiguration.h>
#else
# include <QtNetwork/qtcpsocket.h>
#endif
@@ -100,6 +101,7 @@ public:
};
QAbstractSocket *socket;
bool ssl;
+ bool isInitialized;
ChannelState state;
QHttpNetworkRequest request; // current request
QHttpNetworkReply *reply; // current reply for this request
@@ -118,6 +120,10 @@ public:
#ifndef QT_NO_SSL
bool ignoreAllSslErrors;
QList<QSslError> ignoreSslErrorsList;
+ QSslConfiguration sslConfiguration;
+ void ignoreSslErrors();
+ void ignoreSslErrors(const QList<QSslError> &errors);
+ void setSslConfiguration(const QSslConfiguration &config);
#endif
#ifndef QT_NO_BEARERMANAGEMENT
QSharedPointer<QNetworkSession> networkSession;
@@ -144,6 +150,11 @@ public:
void setConnection(QHttpNetworkConnection *c);
QPointer<QHttpNetworkConnection> connection;
+#ifndef QT_NO_NETWORKPROXY
+ QNetworkProxy proxy;
+ void setProxy(const QNetworkProxy &networkProxy);
+#endif
+
void init();
void close();