From 87d7479fcc5f089ac164c5336b405d0299244c43 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 20 Aug 2009 13:26:38 +0200 Subject: QNAM HTTP Code: Compile fix 2 Those @$#! ifndefs. Reviewed-by: TrustMe --- src/network/access/qhttpnetworkconnectionchannel.cpp | 8 +++----- 1 file 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); -- cgit v0.12