This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit fe2498d7aeaa855a040cce19b33e097e9b07dcd3
Author: Leif Hedstrom <[email protected]>
AuthorDate: Wed Feb 14 16:32:29 2018 -0700

    Disables the support for multi-range request by default
    
    (cherry picked from commit c0c1b2a0bcf7bfa86c1e2bad20b87a5f187f96a2)
    
    Conflicts:
        mgmt/RecordsConfig.cc
        proxy/http/HttpConfig.h
---
 doc/admin-guide/files/records.config.en.rst | 2 +-
 mgmt/RecordsConfig.cc                       | 2 +-
 proxy/http/HttpConfig.h                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/admin-guide/files/records.config.en.rst 
b/doc/admin-guide/files/records.config.en.rst
index 126c452..57579c8 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -1475,7 +1475,7 @@ Security
    post body larger than this limit the response will be terminated with
    413 - Request Entity Too Large and logged accordingly.
 
-.. ts:cv:: CONFIG proxy.config.http.allow_multi_range INT 1
+.. ts:cv:: CONFIG proxy.config.http.allow_multi_range INT 0
    :reloadable:
    :overridable:
 
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 5b29c90..c506eb1 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -611,7 +611,7 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_CONFIG, "proxy.config.http.normalize_ae_gzip", RECD_INT, "1", 
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.allow_multi_range", RECD_INT, "1", 
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.allow_multi_range", RECD_INT, "0", 
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
   ,
 
   //        ####################################################
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index db9a42d..d966804 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -397,7 +397,7 @@ struct OverridableHttpConfigParams {
       cache_required_headers(2),
       cache_range_lookup(1),
       cache_range_write(0),
-      allow_multi_range(1),
+      allow_multi_range(0),
       insert_request_via_string(1),
       insert_response_via_string(0),
       doc_in_cache_skip_dns(1),

Reply via email to