diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-08-20 11:26:38 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-08-20 11:27:41 (GMT) |
| commit | 87d7479fcc5f089ac164c5336b405d0299244c43 (patch) | |
| tree | 87cc86438196d464d8454ac4dc430d798ce9d900 /src/network | |
| parent | 4460cced8935705a79ab6ebce9e57c46ed8969e1 (diff) | |
| download | Qt-87d7479fcc5f089ac164c5336b405d0299244c43.zip Qt-87d7479fcc5f089ac164c5336b405d0299244c43.tar.gz Qt-87d7479fcc5f089ac164c5336b405d0299244c43.tar.bz2 | |
QNAM HTTP Code: Compile fix 2
Those @$#! ifndefs.
Reviewed-by: TrustMe
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 334c31d..37386ea 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -154,8 +154,7 @@ bool QHttpNetworkConnectionChannel::sendRequest() QByteArray header = QHttpNetworkRequestPrivate::header(request, (connection->d_func()->networkProxy.type() != QNetworkProxy::NoProxy)); #else - QByteArray header = QHttpNetworkRequestPrivate::header(channels[i].request, - false); + QByteArray header = QHttpNetworkRequestPrivate::header(request, false); #endif socket->write(header); QNonContiguousByteDevice* uploadByteDevice = request.uploadByteDevice(); @@ -455,7 +454,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection() sslSocket->ignoreSslErrors(); sslSocket->ignoreSslErrors(ignoreSslErrorsList); #else - emitReplyError(socket, channels[index].reply, QNetworkReply::ProtocolUnknownError); + connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolUnknownError); #endif } else { socket->connectToHost(connectHost, connectPort); @@ -689,8 +688,7 @@ void QHttpNetworkConnectionChannel::pipelineInto(HttpMessagePair &pair) QByteArray header = QHttpNetworkRequestPrivate::header(request, (connection->d_func()->networkProxy.type() != QNetworkProxy::NoProxy)); #else - QByteArray header = QHttpNetworkRequestPrivate::header(channels[i].request, - false); + QByteArray header = QHttpNetworkRequestPrivate::header(request, false); #endif socket->write(header); |