From: Automatic source maintenance Date: Sat, 28 Aug 2010 03:58:58 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_1_8~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27c4f7fa19b1b6a564bddfa2fee763841f489671;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/HttpHeader.h b/src/HttpHeader.h index d37ad29200..7bc7fff209 100644 --- a/src/HttpHeader.h +++ b/src/HttpHeader.h @@ -287,7 +287,7 @@ inline bool HttpHeader::chunked() const { return has(HDR_TRANSFER_ENCODING) && - hasListMember(HDR_TRANSFER_ENCODING, "chunked", ','); + hasListMember(HDR_TRANSFER_ENCODING, "chunked", ','); } #endif /* SQUID_HTTPHEADER_H */ diff --git a/src/client_side.cc b/src/client_side.cc index b3e342bbb6..8e20e90cd5 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1322,7 +1322,7 @@ clientSocketRecipient(clientStreamNode * node, ClientHttpRequest * http, // After sending Transfer-Encoding: chunked (at least), always send // the last-chunk if there was no error, ignoring responseFinishedOrFailed. const bool mustSendLastChunk = http->request->flags.chunked_reply && - !http->request->flags.stream_error && !context->startOfOutput(); + !http->request->flags.stream_error && !context->startOfOutput(); if (responseFinishedOrFailed(rep, receivedData) && !mustSendLastChunk) { context->writeComplete(fd, NULL, 0, COMM_OK); PROF_stop(clientSocketRecipient); diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index 2a69bccf95..9699b27a5a 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -1378,7 +1378,7 @@ clientReplyContext::buildReplyHeader() #endif const bool maySendChunkedReply = !request->multipartRangeRequest() && - (request->http_ver >= HttpVersion(1, 1)); + (request->http_ver >= HttpVersion(1, 1)); /* Check whether we should send keep-alive */ if (!Config.onoff.error_pconns && reply->sline.status >= 400 && !request->flags.must_keepalive) { @@ -1403,8 +1403,8 @@ clientReplyContext::buildReplyHeader() // Decide if we send chunked reply if (maySendChunkedReply && - request->flags.proxy_keepalive && - reply->bodySize(request->method) < 0) { + request->flags.proxy_keepalive && + reply->bodySize(request->method) < 0) { debugs(88, 3, "clientBuildReplyHeader: chunked reply"); request->flags.chunked_reply = 1; hdr->putStr(HDR_TRANSFER_ENCODING, "chunked");