diff -r dee5afe5301f -r 3f74d0d4af4c src/network/access/qhttpnetworkconnectionchannel_p.h --- a/src/network/access/qhttpnetworkconnectionchannel_p.h Mon Mar 15 12:43:09 2010 +0200 +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h Thu Apr 08 14:19:33 2010 +0300 @@ -65,6 +65,7 @@ #include #include +#include "qhttpnetworkconnection_p.h" #ifndef QT_NO_HTTP @@ -80,7 +81,6 @@ class QHttpNetworkRequest; class QHttpNetworkReply; class QByteArray; -class QHttpNetworkConnection; #ifndef HttpMessagePair typedef QPair HttpMessagePair; @@ -127,18 +127,10 @@ QList alreadyPipelinedRequests; - QHttpNetworkConnectionChannel() : socket(0), state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false), - lastStatus(0), pendingEncrypt(false), reconnectAttempts(2), - authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None) -#ifndef QT_NO_OPENSSL - , ignoreAllSslErrors(false) -#endif - , pipeliningSupported(PipeliningSupportUnknown) - , connection(0) - {} - - void setConnection(QHttpNetworkConnection *c) {connection = c;} - QHttpNetworkConnection *connection; + QHttpNetworkConnectionChannel(); + + void setConnection(QHttpNetworkConnection *c); + QPointer connection; void init(); void close(); @@ -157,6 +149,7 @@ void requeueCurrentlyPipelinedRequests(); void detectPipeliningSupport(); + void handleUnexpectedEOF(); void closeAndResendCurrentRequest(); void eatWhitespace(); @@ -186,8 +179,6 @@ #endif }; - - QT_END_NAMESPACE #endif // QT_NO_HTTP