diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-10-29 15:08:30 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-12-10 12:16:48 +0000 |
| commit | e25d7b14416b2d0ac2598bc03a7c2b8d96e63d42 (patch) | |
| tree | 73bcf1dd6e5b8cc7807f7eb7b28ec94800a238ce /src/network/ssl/qsslsocket.cpp | |
| parent | 3464e1e5c7b5b01ae13c99e3529dd02af1d36958 (diff) | |
Add a means to specify the protocol type, to aid websockets over proxy
When a PAC script is used on macOS, it will only allow connections for
http/https, although a proxy can be used for ws/wss. Therefore we need
to add a means of setting the protocol type for this sort of connection
so that we can pass on the necessary information to the PAC script.
Change-Id: I3fa29fa85a529bd88d9565daa58fe9d748b61a92
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 270e81774d..8b7d48be15 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1977,6 +1977,7 @@ void QSslSocket::connectToHost(const QString &hostName, quint16 port, OpenMode o d->createPlainSocket(openMode); } #ifndef QT_NO_NETWORKPROXY + d->plainSocket->setProtocolTag(d->protocolTag); d->plainSocket->setProxy(proxy()); #endif QIODevice::open(openMode); |