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 2014/03/27 03:38:07 UTC

git commit: TS-2654 Crash in Range requests with read-while-writer.

Repository: trafficserver
Updated Branches:
  refs/heads/master 01d0101f6 -> dec4fdb96


TS-2654 Crash in Range requests with read-while-writer.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dec4fdb9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dec4fdb9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dec4fdb9

Branch: refs/heads/master
Commit: dec4fdb96b135aa92b7146c9dd2f6ff7971f9c5d
Parents: 01d0101
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Mar 26 20:38:01 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Mar 26 20:38:01 2014 -0600

----------------------------------------------------------------------
 CHANGES                    | 2 ++
 proxy/http/HttpTransact.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dec4fdb9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 24b9357..43a86d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2654] Crash in Range requests with read-while-writer.
+
   *) [TS-2665] Clean up ink_stack_trace_dump code
    Thanks to Alexey Ivanov <ai...@linkedin.com> for reporting this issue.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dec4fdb9/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 3e9ab51..2c25fc9 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -6750,7 +6750,7 @@ HttpTransact::handle_content_length_header(State* s, HTTPHdr* header, HTTPHdr* b
 
       case SOURCE_TRANSFORM:
         if (s->range_setup == HttpTransact::RANGE_REQUESTED) {
-          change_response_header_because_of_range_request(s, header);
+          header->set_content_length(s->range_output_cl);
           s->hdr_info.trust_response_cl = true;
         } else if (s->hdr_info.transform_response_cl == HTTP_UNDEFINED_CL) {
           s->hdr_info.trust_response_cl = false;