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

some slots are disfunctional; refs #13 closes #15

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-01-14 13:39:59 +00:00
parent cada2da8b6
commit 4bdf7810b0
9 changed files with 879 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,26 @@
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
--- 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
@@ -130,6 +130,9 @@
@@ -46,6 +46,8 @@
#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)),
this, SLOT(_q_encryptedBytesWritten(qint64)),
Qt::DirectConnection);
+ QObject::connect(sslSocket, SIGNAL(extendedContextInitialization(ssl_ctx_st*)),
+ assert(QObject::connect(sslSocket, SIGNAL(extendedContextInitialization(ssl_ctx_st*)),
+ this, SLOT(_q_extendedContextInitialization(ssl_ctx_st*)),
+ Qt::DirectConnection);
+ Qt::DirectConnection));
}
#endif
}
@@ -1019,6 +1022,13 @@
@@ -1019,6 +1024,13 @@
emit connection->sslErrors(errors);
}
@@ -89,31 +98,49 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce
QT_BEGIN_NAMESPACE
class QAuthenticator;
@@ -185,7 +189,8 @@
@@ -185,7 +189,7 @@
void redirectionRequested(const QUrl &destination);
void sslErrors(const QList<QSslError> &errors);
void emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal);
-
+ void extendedContextInitialization(ssl_ctx_st* ctx);
private:
friend class QNetworkAccessManager;
friend class QNetworkAccessManagerPrivate;
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.mrw/src/network/access/qnetworkaccesshttpbackend.cpp 2011-01-13 17:31:39.044840998 +0100
@@ -349,6 +349,8 @@
@@ -52,6 +52,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
connect(http, SIGNAL(sslErrors(QList<QSslError>)),
SLOT(sslErrors(QList<QSslError>)));
+ connect(http, SIGNAL(extendedContextInitialization(ssl_ctx_st*)),
+ SLOT(extendedContextInitialization(ssl_ctx_st*)));
+ assert(connect(http, SIGNAL(extendedContextInitialization(ssl_ctx_st*)),
+ SLOT(extendedContextInitialization(ssl_ctx_st*))));
#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
--- 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
@@ -777,6 +777,16 @@
@@ -60,6 +60,8 @@
#include "QtNetwork/qauthenticator.h"
#include "QtNetwork/qsslconfiguration.h"
+#include <cassert>
+
QT_BEGIN_NAMESPACE
#ifndef QT_NO_HTTP
@@ -777,6 +779,16 @@
#endif
}
@@ -130,11 +157,11 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce
QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply)
{
Q_Q(QNetworkAccessManager);
@@ -786,6 +796,7 @@
@@ -786,6 +798,7 @@
/* In case we're compiled without SSL support, we don't have this signal and we need to
* avoid getting a connection error. */
q->connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(_q_replySslErrors(QList<QSslError>)));
+ q->connect(reply, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), SLOT(_q_extendedContextInitialization(ssl_ctx_st*)));
+ assert(q->connect(reply, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), SLOT(_q_extendedContextInitialization(ssl_ctx_st*))));
#endif
return reply;