diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-06 13:47:24 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-07 10:57:34 +0200 |
| commit | 2fddd3c9b7e45b58b56fec9b89c78af0a8f75731 (patch) | |
| tree | 66ddb4565480a3ebf97eae344b87047b6e01f51e /src/network/kernel/qnetworkproxy.cpp | |
| parent | 83566cfac942c8ca7620cf95ae47655d6ff475c3 (diff) | |
| download | qt4-tools-2fddd3c9b7e45b58b56fec9b89c78af0a8f75731.tar.gz | |
Clarify documentation in QNetworkProxy about SOCKS5 supporting domain
name resolution
Task-number: 252761
Diffstat (limited to 'src/network/kernel/qnetworkproxy.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index f4ece97671..5a00840956 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -86,10 +86,11 @@ The SOCKS5 support in Qt 4 is based on \l{RFC 1928} and \l{RFC 1929}. The supported authentication methods are no authentication and username/password authentication. Both IPv4 and IPv6 are - supported, but domain name resolution via the SOCKS server is not - supported; i.e. all domain names are resolved locally. There are - several things to remember when using SOCKS5 with QUdpSocket and - QTcpServer: + supported. Domain names are resolved through the SOCKS5 server if + the QNetworkProxy::HostNameLookupCapability is enabled, otherwise + they are resolved locally and the IP address is sent to the + server. There are several things to remember when using SOCKS5 + with QUdpSocket and QTcpServer: With QUdpSocket, a call to \l {QUdpSocket::bind()}{bind()} may fail with a timeout error. If a port number other than 0 is passed to |