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 2017/11/30 16:09:41 UTC
[trafficserver] branch master updated: Revert "bugfix for malformed
chunked response will be cached under some terrible network circumstances, "
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new bb3cd1a Revert "bugfix for malformed chunked response will be cached under some terrible network circumstances,"
bb3cd1a is described below
commit bb3cd1ac70aa16a6428c69c615a234bda76320d3
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Wed Nov 29 11:41:00 2017 -0700
Revert "bugfix for malformed chunked response will be cached under some terrible network circumstances,"
This reverts commit c2df5ba8d33b5774a35d5bc06289a7808149a337.
---
proxy/http/HttpSM.cc | 14 +-------------
proxy/http/HttpTunnel.cc | 6 +-----
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 8f9d652..64affa1 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2975,19 +2975,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
tunnel.append_message_to_producer_buffer(p, reason, reason_len);
}
*/
- // add fix code for caching incompleted chunked response case under some terrible network circumstances
- // disable cache write for the malformed chunked response
- if ((p->do_dechunking || p->do_chunked_passthru) && p->chunked_handler.truncation) {
- DebugSM("http", "[%" PRId64 "] [HttpSM::tunnel_handler_server] disable cache write due to server truncation but still send "
- "partial response to client",
- sm_id);
- tunnel.abort_cache_write_finish_others(p);
- // We couldn't read all chunks successfully, disable keep-alive.
- t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
- t_state.current.server->keep_alive = HTTP_NO_KEEPALIVE;
- } else {
- tunnel.local_finish_all(p);
- }
+ tunnel.local_finish_all(p);
}
break;
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index 9bc9f0c..aecf2f5 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -1503,15 +1503,11 @@ HttpTunnel::finish_all_internal(HttpTunnelProducer *p, bool chain)
if (chain == true && c->self_producer) {
chain_finish_all(c->self_producer);
}
- // add fixed code for caching incompleted chunked response case under some terrible network circumstances
- if (c->vc_type == HT_HTTP_CLIENT && p->chunked_handler.truncation == true) {
- consumer_handler(VC_EVENT_EOS, c);
- }
// The IO Core will not call us back if there
// is nothing to do. Check to see if there is
// nothing to do and take the appripriate
// action
- else if (c->write_vio && c->write_vio->nbytes == c->write_vio->ndone) {
+ if (c->write_vio && c->write_vio->nbytes == c->write_vio->ndone) {
consumer_handler(VC_EVENT_WRITE_COMPLETE, c);
}
}
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].