diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 6 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index d3e4c94873..c097ed9839 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -129,9 +129,9 @@ \value NoProxy No proxying is used \value DefaultProxy Proxy is determined based on the application proxy set using setApplicationProxy() \value Socks5Proxy \l Socks5 proxying is used - \value HttpProxy HTTP transparent proxying is used - \value HttpCachingProxy Proxying for HTTP requests only - \value FtpCachingProxy Proxying for FTP requests only + \value HttpProxy HTTP transparent proxying is used (This value was introduced in 4.3.) + \value HttpCachingProxy Proxying for HTTP requests only (This value was introduced in 4.4.) + \value FtpCachingProxy Proxying for FTP requests only (This value was introduced in 4.4.) The table below lists different proxy types and their capabilities. Since each proxy type has different capabilities, it diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index fd33b5f274..a8c3964c9d 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -301,20 +301,23 @@ \value ProxyAuthenticationRequiredError The socket is using a proxy, and the proxy requires authentication. \value SslHandshakeFailedError The SSL/TLS handshake failed, so - the connection was closed (only used in QSslSocket) + the connection was closed (only used in QSslSocket) (This value was introduced in 4.4.) \value UnfinishedSocketOperationError Used by QAbstractSocketEngine only, The last operation attempted has not finished yet (still in progress in - the background). + the background). (This value was introduced in 4.4.) \value ProxyConnectionRefusedError Could not contact the proxy server because - the connection to that server was denied + the connection to that server was denied (This value was introduced in 4.5.) \value ProxyConnectionClosedError The connection to the proxy server was closed - unexpectedly (before the connection to the final peer was established) + unexpectedly (before the connection to the final peer was established) + (This value was introduced in 4.5.) \value ProxyConnectionTimeoutError The connection to the proxy server timed out or the proxy server stopped responding in the authentication phase. + (This value was introduced in 4.5.) \value ProxyNotFoundError The proxy address set with setProxy() (or the application - proxy) was not found. + proxy) was not found. (This value was introduced in 4.5.) \value ProxyProtocolError The connection negotiation with the proxy server because the response from the proxy server could not be understood. + (This value was introduced in 4.5.) \value UnknownSocketError An unidentified error occurred. \sa QAbstractSocket::error() |