web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

closes #16

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-01-17 13:45:19 +00:00
parent 4bdf7810b0
commit 6d5a8ff5c4
1 changed files with 65 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
qt/patch/qt-sources-patch.diff
View File

@@ -1,26 +1,17 @@
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnectionchannel.cpp diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel.cpp qt-everywhere-opensource-src-4.6.3.new/src/network/access/qhttpnetworkconnectionchannel.cpp
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel.cpp 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel.cpp 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnectionchannel.cpp 2011-01-13 17:44:14.984841004 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qhttpnetworkconnectionchannel.cpp 2011-01-14 13:51:18.614841001 +0100
@@ -46,6 +46,8 @@ @@ -130,6 +130,9 @@
#include <qpair.h>
#include <qdebug.h>
+#include <cassert>
+
#ifndef QT_NO_HTTP
#ifndef QT_NO_OPENSSL
@@ -130,6 +132,9 @@
QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)), QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
this, SLOT(_q_encryptedBytesWritten(qint64)), this, SLOT(_q_encryptedBytesWritten(qint64)),
Qt::DirectConnection); Qt::DirectConnection);
+ assert(QObject::connect(sslSocket, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), + QObject::connect(sslSocket, SIGNAL(extendedContextInitialization(ssl_ctx_st*)),
+ this, SLOT(_q_extendedContextInitialization(ssl_ctx_st*)), + this, SLOT(_q_extendedContextInitialization(ssl_ctx_st*)),
+ Qt::DirectConnection)); + Qt::DirectConnection);
} }
#endif #endif
} }
@@ -1019,6 +1024,13 @@ @@ -1019,6 +1022,13 @@
emit connection->sslErrors(errors); emit connection->sslErrors(errors);
} }
@@ -28,15 +19,15 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetwork
+{ +{
+ if (!socket) + if (!socket)
+ return; + return;
+ emit connection->extendedContextInitialization(ctx); + emit connection->extendedContextInitialization(ctx, qobject_cast<QSslSocket*>(socket));
+} +}
+ +
void QHttpNetworkConnectionChannel::_q_encryptedBytesWritten(qint64 bytes) void QHttpNetworkConnectionChannel::_q_encryptedBytesWritten(qint64 bytes)
{ {
Q_UNUSED(bytes); Q_UNUSED(bytes);
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel_p.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnectionchannel_p.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel_p.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qhttpnetworkconnectionchannel_p.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel_p.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel_p.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnectionchannel_p.h 2011-01-13 16:23:56.744840998 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qhttpnetworkconnectionchannel_p.h 2011-01-14 13:24:28.974841007 +0100
@@ -76,6 +76,10 @@ @@ -76,6 +76,10 @@
# include <QtNetwork/qtcpsocket.h> # include <QtNetwork/qtcpsocket.h>
#endif #endif
@@ -56,37 +47,37 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetwork
void _q_encryptedBytesWritten(qint64 bytes); // proceed sending void _q_encryptedBytesWritten(qint64 bytes); // proceed sending
#endif #endif
}; };
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnection_p.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnection_p.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnection_p.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qhttpnetworkconnection_p.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnection_p.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnection_p.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnection_p.h 2011-01-13 15:25:26.204841004 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qhttpnetworkconnection_p.h 2011-01-14 13:19:27.444841004 +0100
@@ -123,6 +123,7 @@ @@ -123,6 +123,7 @@
Q_SIGNALS: Q_SIGNALS:
void sslErrors(const QList<QSslError> &errors); void sslErrors(const QList<QSslError> &errors);
+ void extendedContextInitialization(ssl_ctx_st*); + void extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket);
#endif #endif
Q_SIGNALS: Q_SIGNALS:
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessbackend.cpp diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend.cpp qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessbackend.cpp
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend.cpp 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend.cpp 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessbackend.cpp 2011-01-13 16:03:11.054841008 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessbackend.cpp 2011-01-14 13:29:49.374841004 +0100
@@ -341,4 +341,13 @@ @@ -341,4 +341,13 @@
#endif #endif
} }
+void QNetworkAccessBackend::extendedContextInitialization(ssl_ctx_st* ctx) +void QNetworkAccessBackend::extendedContextInitialization(ssl_ctx_st* ctx, QSslSocket *socket)
+{ +{
+#ifndef QT_NO_OPENSSL +#ifndef QT_NO_OPENSSL
+ reply->extendedContextInitialization(ctx); + reply->extendedContextInitialization(ctx, socket);
+#else +#else
+ Q_UNUSED(ctx); + Q_UNUSED(ctx);
+#endif +#endif
+} +}
+ +
QT_END_NAMESPACE QT_END_NAMESPACE
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend_p.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessbackend_p.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend_p.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessbackend_p.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend_p.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessbackend_p.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessbackend_p.h 2011-01-13 16:23:31.054841004 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessbackend_p.h 2011-01-14 13:30:12.634841002 +0100
@@ -56,6 +56,10 @@ @@ -56,6 +56,10 @@
#include "qnetworkreplyimpl_p.h" #include "qnetworkreplyimpl_p.h"
#include "QtCore/qobject.h" #include "QtCore/qobject.h"
@@ -98,57 +89,38 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAuthenticator; class QAuthenticator;
@@ -185,7 +189,7 @@ @@ -185,6 +189,7 @@
void redirectionRequested(const QUrl &destination); void redirectionRequested(const QUrl &destination);
void sslErrors(const QList<QSslError> &errors); void sslErrors(const QList<QSslError> &errors);
void emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal); void emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal);
- + void extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket);
+ void extendedContextInitialization(ssl_ctx_st* ctx);
private: private:
friend class QNetworkAccessManager; friend class QNetworkAccessManager;
friend class QNetworkAccessManagerPrivate; diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccesshttpbackend.cpp qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccesshttpbackend.cpp
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccesshttpbackend.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccesshttpbackend.cpp
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccesshttpbackend.cpp 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccesshttpbackend.cpp 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccesshttpbackend.cpp 2011-01-13 17:31:39.044840998 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccesshttpbackend.cpp 2011-01-14 13:18:35.404841004 +0100
@@ -52,6 +52,8 @@ @@ -349,6 +349,8 @@
#include "QtCore/qdatetime.h"
#include "QtNetwork/qsslconfiguration.h"
+#include <cassert>
+
#ifndef QT_NO_HTTP
#include <string.h> // for strchr
@@ -349,6 +351,8 @@
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
connect(http, SIGNAL(sslErrors(QList<QSslError>)), connect(http, SIGNAL(sslErrors(QList<QSslError>)),
SLOT(sslErrors(QList<QSslError>))); SLOT(sslErrors(QList<QSslError>)));
+ assert(connect(http, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), + connect(http, SIGNAL(extendedContextInitialization(ssl_ctx_st*, QSslSocket*)),
+ SLOT(extendedContextInitialization(ssl_ctx_st*)))); + SLOT(extendedContextInitialization(ssl_ctx_st*, QSslSocket*)));
#endif #endif
} }
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager.cpp diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.cpp qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessmanager.cpp
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.cpp 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.cpp 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager.cpp 2011-01-13 17:31:56.404841001 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessmanager.cpp 2011-01-14 13:21:07.544841001 +0100
@@ -60,6 +60,8 @@ @@ -777,6 +777,16 @@
#include "QtNetwork/qauthenticator.h"
#include "QtNetwork/qsslconfiguration.h"
+#include <cassert>
+
QT_BEGIN_NAMESPACE
#ifndef QT_NO_HTTP
@@ -777,6 +779,16 @@
#endif #endif
} }
+void QNetworkAccessManagerPrivate::_q_extendedContextInitialization(ssl_ctx_st* ctx) +void QNetworkAccessManagerPrivate::_q_extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket)
+{ +{
+#ifndef QT_NO_OPENSSL +#ifndef QT_NO_OPENSSL
+ Q_Q(QNetworkAccessManager); + Q_Q(QNetworkAccessManager);
+ emit q->extendedContextInitialization(ctx); + emit q->extendedContextInitialization(ctx, socket);
+#else +#else
+ Q_UNUSED(ctx); + Q_UNUSED(ctx);
+#endif +#endif
@@ -157,17 +129,17 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce
QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply) QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply)
{ {
Q_Q(QNetworkAccessManager); Q_Q(QNetworkAccessManager);
@@ -786,6 +798,7 @@ @@ -786,6 +796,7 @@
/* In case we're compiled without SSL support, we don't have this signal and we need to /* In case we're compiled without SSL support, we don't have this signal and we need to
* avoid getting a connection error. */ * avoid getting a connection error. */
q->connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(_q_replySslErrors(QList<QSslError>))); q->connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(_q_replySslErrors(QList<QSslError>)));
+ assert(q->connect(reply, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), SLOT(_q_extendedContextInitialization(ssl_ctx_st*)))); + q->connect(reply, SIGNAL(extendedContextInitialization(ssl_ctx_st*, QSslSocket*)), SLOT(_q_extendedContextInitialization(ssl_ctx_st*, QSslSocket*)));
#endif #endif
return reply; return reply;
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessmanager.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager.h 2011-01-13 18:02:19.694840999 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessmanager.h 2011-01-14 13:22:42.014840998 +0100
@@ -46,6 +46,10 @@ @@ -46,6 +46,10 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
@@ -179,25 +151,33 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Network) QT_MODULE(Network)
@@ -111,6 +115,7 @@ @@ -62,6 +66,7 @@
class QNetworkProxy;
class QNetworkProxyFactory;
class QSslError;
+class QSslSocket;
class QNetworkReplyImplPrivate;
class QNetworkAccessManagerPrivate;
@@ -111,6 +116,7 @@
void finished(QNetworkReply *reply); void finished(QNetworkReply *reply);
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors); void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
+ void extendedContextInitialization(ssl_ctx_st* ctx); + void extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket);
#endif #endif
protected: protected:
@@ -122,6 +127,7 @@ @@ -122,6 +128,7 @@
Q_DECLARE_PRIVATE(QNetworkAccessManager) Q_DECLARE_PRIVATE(QNetworkAccessManager)
Q_PRIVATE_SLOT(d_func(), void _q_replyFinished()) Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>)) Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>))
+ Q_PRIVATE_SLOT(d_func(), void _q_extendedContextInitialization(ssl_ctx_st*)) + Q_PRIVATE_SLOT(d_func(), void _q_extendedContextInitialization(ssl_ctx_st*, QSslSocket*))
}; };
QT_END_NAMESPACE QT_END_NAMESPACE
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager_p.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager_p.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager_p.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessmanager_p.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager_p.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager_p.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager_p.h 2011-01-13 16:23:47.974840996 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkaccessmanager_p.h 2011-01-14 13:28:00.214841000 +0100
@@ -59,6 +59,10 @@ @@ -59,6 +59,10 @@
#include "private/qobject_p.h" #include "private/qobject_p.h"
#include "QtNetwork/qnetworkproxy.h" #include "QtNetwork/qnetworkproxy.h"
@@ -213,13 +193,13 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce
void _q_replyFinished(); void _q_replyFinished();
void _q_replySslErrors(const QList<QSslError> &errors); void _q_replySslErrors(const QList<QSslError> &errors);
+ void _q_extendedContextInitialization(ssl_ctx_st* ctx); + void _q_extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket);
QNetworkReply *postProcess(QNetworkReply *reply); QNetworkReply *postProcess(QNetworkReply *reply);
void createCookieJar() const; void createCookieJar() const;
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreply.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkreply.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreply.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkreply.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreply.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreply.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkreply.h 2011-01-13 16:24:14.664840998 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkreply.h 2011-01-14 13:20:14.464841001 +0100
@@ -51,6 +51,10 @@ @@ -51,6 +51,10 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
@@ -235,22 +215,22 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkrepl
void error(QNetworkReply::NetworkError); void error(QNetworkReply::NetworkError);
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
void sslErrors(const QList<QSslError> &errors); void sslErrors(const QList<QSslError> &errors);
+ void extendedContextInitialization(ssl_ctx_st*); + void extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket);
#endif #endif
void uploadProgress(qint64 bytesSent, qint64 bytesTotal); void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkreplyimpl.cpp diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl.cpp qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkreplyimpl.cpp
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl.cpp 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl.cpp 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkreplyimpl.cpp 2011-01-13 16:27:21.854841009 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkreplyimpl.cpp 2011-01-14 13:28:57.174841008 +0100
@@ -590,6 +590,16 @@ @@ -590,6 +590,16 @@
#endif #endif
} }
+void QNetworkReplyImplPrivate::extendedContextInitialization(ssl_ctx_st* ctx) +void QNetworkReplyImplPrivate::extendedContextInitialization(ssl_ctx_st* ctx, QSslSocket *socket)
+{ +{
+#ifndef QT_NO_OPENSSL +#ifndef QT_NO_OPENSSL
+ Q_Q(QNetworkReplyImpl); + Q_Q(QNetworkReplyImpl);
+ emit q->extendedContextInitialization(ctx); + emit q->extendedContextInitialization(ctx, socket);
+#else +#else
+ Q_UNUSED(ctx); + Q_UNUSED(ctx);
+#endif +#endif
@@ -259,9 +239,9 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkrepl
bool QNetworkReplyImplPrivate::isFinished() const bool QNetworkReplyImplPrivate::isFinished() const
{ {
return (state == Finished || state == Aborted); return (state == Finished || state == Aborted);
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl_p.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkreplyimpl_p.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl_p.h qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkreplyimpl_p.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl_p.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkreplyimpl_p.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkreplyimpl_p.h 2011-01-13 16:28:23.784841003 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/access/qnetworkreplyimpl_p.h 2011-01-14 13:29:14.444841006 +0100
@@ -63,6 +63,10 @@ @@ -63,6 +63,10 @@
#include "private/qringbuffer_p.h" #include "private/qringbuffer_p.h"
#include "private/qbytedata_p.h" #include "private/qbytedata_p.h"
@@ -277,13 +257,13 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkrepl
void metaDataChanged(); void metaDataChanged();
void redirectionRequested(const QUrl &target); void redirectionRequested(const QUrl &target);
void sslErrors(const QList<QSslError> &errors); void sslErrors(const QList<QSslError> &errors);
+ void extendedContextInitialization(ssl_ctx_st* ctx); + void extendedContextInitialization(ssl_ctx_st *ctx, QSslSocket *socket);
bool isFinished() const; bool isFinished() const;
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket.h qt-everywhere-opensource-src-4.6.3.mrw/src/network/ssl/qsslsocket.h diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket.h qt-everywhere-opensource-src-4.6.3.new/src/network/ssl/qsslsocket.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket.h 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket.h 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/ssl/qsslsocket.h 2011-01-13 16:22:52.144840999 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/ssl/qsslsocket.h 2011-01-14 09:20:28.954841003 +0100
@@ -52,6 +52,10 @@ @@ -52,6 +52,10 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
@@ -303,9 +283,9 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket.h qt
protected Q_SLOTS: protected Q_SLOTS:
void connectToHostImplementation(const QString &hostName, quint16 port, void connectToHostImplementation(const QString &hostName, quint16 port,
diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/ssl/qsslsocket_openssl.cpp diff -ur qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.6.3.new/src/network/ssl/qsslsocket_openssl.cpp
--- qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket_openssl.cpp 2010-06-02 04:03:17.000000000 +0200 --- qt-everywhere-opensource-src-4.6.3.orig/src/network/ssl/qsslsocket_openssl.cpp 2010-06-02 04:03:17.000000000 +0200
+++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/ssl/qsslsocket_openssl.cpp 2011-01-13 11:28:33.734841002 +0100 +++ qt-everywhere-opensource-src-4.6.3.new/src/network/ssl/qsslsocket_openssl.cpp 2011-01-14 09:20:28.954841003 +0100
@@ -340,6 +340,8 @@ @@ -340,6 +340,8 @@
// Set verification depth. // Set verification depth.
if (configuration.peerVerifyDepth != 0) if (configuration.peerVerifyDepth != 0)