diff options
| author | con <qtc-committer@nokia.com> | 2011-03-10 16:53:45 (GMT) |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-03-10 19:44:31 (GMT) |
| commit | dc96e9a935d8a48bae173b4febfb3bf32b34788d (patch) | |
| tree | cebc4d734a28a3138e9b7f612dcfbe54a826af85 /src | |
| parent | e250660cced1f0bcb16494c23277f9205833ec03 (diff) | |
| download | Qt-dc96e9a935d8a48bae173b4febfb3bf32b34788d.zip Qt-dc96e9a935d8a48bae173b4febfb3bf32b34788d.tar.gz Qt-dc96e9a935d8a48bae173b4febfb3bf32b34788d.tar.bz2 | |
Fix http in combination with QT_NO_NETWORKPROXY.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 2 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index b26563a..d1a73a6 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -579,7 +579,7 @@ #endif // Hyper Text Transfer Protocol -#if !defined(QT_NO_HTTP) && (defined(QT_NO_HOSTINFO) || defined(QT_NO_NETWORKPROXY)) +#if !defined(QT_NO_HTTP) && defined(QT_NO_HOSTINFO) #define QT_NO_HTTP #endif diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index f07fbd5..4d938a9 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -1050,7 +1050,7 @@ SeeAlso: ??? Feature: HTTP Description: Supports HTTP file access. Section: Networking -Requires: HOSTINFO NETWORKPROXY +Requires: HOSTINFO Name: Hyper Text Transfer Protocol SeeAlso: ??? diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 079f608..228bc58 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -91,8 +91,10 @@ void QHttpNetworkConnectionChannel::init() #else socket = new QTcpSocket; #endif +#ifndef QT_NO_NETWORKPROXY // Set by QNAM anyway, but let's be safe here socket->setProxy(QNetworkProxy::NoProxy); +#endif QObject::connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(_q_bytesWritten(qint64)), @@ -581,13 +583,15 @@ bool QHttpNetworkConnectionChannel::ensureConnection() #endif } else { // In case of no proxy we can use the Unbuffered QTcpSocket +#ifndef QT_NO_NETWORKPROXY if (connection->d_func()->networkProxy.type() == QNetworkProxy::NoProxy && connection->cacheProxy().type() == QNetworkProxy::NoProxy && connection->transparentProxy().type() == QNetworkProxy::NoProxy) { +#endif socket->connectToHost(connectHost, connectPort, QIODevice::ReadWrite | QIODevice::Unbuffered); // For an Unbuffered QTcpSocket, the read buffer size has a special meaning. socket->setReadBufferSize(1*1024); - +#ifndef QT_NO_NETWORKPROXY } else { socket->connectToHost(connectHost, connectPort); @@ -596,6 +600,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection() // here and there. socket->setReadBufferSize(64*1024); } +#endif } return false; } |