ccdcad45ca
Important changes: qt5-enginio and qt5-enginio-devel are gone. qt5-plugin-gtk is gone. New submodules are qt5-charts, qt5-datavis3d, qt5-gamepad, qt5-scxml and qt5-virtualkeyboard. Packages which require updates: python-PyQt5, qtcreator-full
29 lines
827 B
Diff
29 lines
827 B
Diff
--- qtwebengine/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2015-12-10 18:17:21.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2016-01-14
|
|
17:11:38.432633534 +0100
|
|
@@ -57,6 +57,10 @@
|
|
#include "net/ssl/ssl_platform_key.h"
|
|
#endif
|
|
|
|
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
|
|
+#include "net/cert_net/nss_ocsp.h"
|
|
+#endif
|
|
+
|
|
namespace net {
|
|
|
|
namespace {
|
|
@@ -795,6 +799,14 @@
|
|
DCHECK(!ssl_);
|
|
DCHECK(!transport_bio_);
|
|
|
|
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
|
|
+ if (ssl_config_.cert_io_enabled) {
|
|
+ // TODO(davidben): Move this out of SSLClientSocket. See
|
|
+ // https://crbug.com/539520.
|
|
+ EnsureNSSHttpIOInit();
|
|
+ }
|
|
+#endif
|
|
+
|
|
SSLContext* context = SSLContext::GetInstance();
|
|
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
|
|
|