diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-09 13:03:54 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-09 13:03:54 +0200 |
| commit | 8bc84e2180e1d5819b372f4cd8c236b853145803 (patch) | |
| tree | 6c5e6a8b6a1750e2484fd34f48be662fcf51959f /src/network/access/qhttpnetworkconnection_p.h | |
| parent | d641198fa71fadd243e84dfdf02b9a0536a27b3f (diff) | |
| parent | 3b1e30bb1d6651a626aba1f6b8883f5524598ed3 (diff) | |
Merge commit 'origin/master' into 4.6-merged
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
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 3d92cf9c8f..a0813d4095 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -243,7 +243,8 @@ public: bool ignoreSSLErrors; #endif Channel() : socket(0), state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false), - reconnectAttempts(2), authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None) + lastStatus(0), pendingEncrypt(false), reconnectAttempts(2), + authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None) #ifndef QT_NO_OPENSSL , ignoreSSLErrors(false) #endif |