You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/09/10 17:10:11 UTC
[45/48] git commit: Remove s from indentation
Remove <tab>s from indentation
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/55f792ee
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/55f792ee
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/55f792ee
Branch: refs/heads/5.0.x
Commit: 55f792ee0ec3461db0e4299a138081cdf567f8ba
Parents: ecd87cf
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Sep 9 21:16:19 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Sep 9 21:16:19 2013 -0600
----------------------------------------------------------------------
proxy/http/HttpTransact.cc | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/55f792ee/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 01a5f76..de180aa 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -6780,21 +6780,21 @@ HttpTransact::handle_response_keep_alive_headers(State* s, HTTPVersion ver, HTTP
if (s->client_info.http_version == HTTPVersion(1, 1) && s->txn_conf->chunking_enabled == 1 &&
// if we're not sending a body, don't set a chunked header regardless of server response
!is_response_body_precluded(s->hdr_info.client_response.status_get(), s->method) &&
- // we do not need chunked encoding for internal error messages
- // that are sent to the client if the server response is not valid.
- (( (s->source == SOURCE_HTTP_ORIGIN_SERVER || s->source == SOURCE_TRANSFORM) &&
- s->hdr_info.server_response.valid() &&
- // if we receive a 304, we will serve the client from the
- // cache and thus do not need chunked encoding.
- s->hdr_info.server_response.status_get() != HTTP_STATUS_NOT_MODIFIED &&
- (s->current.server->transfer_encoding == HttpTransact::CHUNKED_ENCODING ||
- // we can use chunked encoding if we cannot trust the content
- // length (e.g. no Content-Length and Connection:close in HTTP/1.1 responses)
- s->hdr_info.trust_response_cl == false)) ||
+ // we do not need chunked encoding for internal error messages
+ // that are sent to the client if the server response is not valid.
+ (((s->source == SOURCE_HTTP_ORIGIN_SERVER || s->source == SOURCE_TRANSFORM) &&
+ s->hdr_info.server_response.valid() &&
+ // if we receive a 304, we will serve the client from the
+ // cache and thus do not need chunked encoding.
+ s->hdr_info.server_response.status_get() != HTTP_STATUS_NOT_MODIFIED &&
+ (s->current.server->transfer_encoding == HttpTransact::CHUNKED_ENCODING ||
+ // we can use chunked encoding if we cannot trust the content
+ // length (e.g. no Content-Length and Connection:close in HTTP/1.1 responses)
+ s->hdr_info.trust_response_cl == false)) ||
// handle serve from cache (read-while-write) case
(s->source == SOURCE_CACHE && s->hdr_info.trust_response_cl == false) ||
- //any transform will potentially alter the content length. try chunking if possible
- (s->source == SOURCE_TRANSFORM && s->hdr_info.trust_response_cl == false ))) {
+ //any transform will potentially alter the content length. try chunking if possible
+ (s->source == SOURCE_TRANSFORM && s->hdr_info.trust_response_cl == false ))) {
s->client_info.receive_chunked_response = true;
heads->value_append(MIME_FIELD_TRANSFER_ENCODING, MIME_LEN_TRANSFER_ENCODING, HTTP_VALUE_CHUNKED, HTTP_LEN_CHUNKED, true);
} else {