diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-30 12:58:16 +0200 |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-30 12:58:16 +0200 |
| commit | 116683d4284646d91013e6f3a8d940c8855fbca3 (patch) | |
| tree | 93bdc46bec4f274ef28939e1840cdfc39bcfcc05 /src/network/access/qhttpnetworkconnection_p.h | |
| parent | 5a54b2c4c448ea22adb56bc191303abca34f230b (diff) | |
| parent | 238a618b5482e0471f46ed71362492be9c4df4a6 (diff) | |
Merge branch '4.5'
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 3eb8ffec8a..a0813d4095 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -242,7 +242,8 @@ public: #ifndef QT_NO_OPENSSL bool ignoreSSLErrors; #endif - Channel() :state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false), reconnectAttempts(2), + Channel() : 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 , ignoreSSLErrors(false) |