diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-04-26 16:59:10 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-05-02 15:37:38 +0000 |
| commit | 9f416fad366f24436204a67b6571024d7bebe98f (patch) | |
| tree | af37bee944c37dea9e9d51cbc342a1a31100be83 /src/network/ssl/qsslsocket_openssl.cpp | |
| parent | ea97a43175bde48c6cbaf643988b286099c1667b (diff) | |
qsslsocket/context_openssl - ALPN and NPN, not ALPN or NPN
ALPN and NPN should not be mutually exclusive, it's possible that our
peer does not support ALPN but does support a protocol we can negotiate
via NPN. So use them both.
Change-Id: Ib3c8066d89117efab55ac8435cc2c806c7a1ece0
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 48f8e258df..5c0c8674cd 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1564,7 +1564,9 @@ void QSslSocketBackendPrivate::continueHandshake() // Client does not have a callback that sets it ... configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; } - } else { + } + + if (!proto_len) { // Test if NPN was more lucky ... #else { #endif |