From: Ryan Bloom <rbb@apache.org>
Date: Sun, 28 Jan 2001 03:38:21 +0000 (+0000)
Subject: Use the new error bucket to report HTTP_RANGE_NOT_SATISFIABLE from
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8caf9a508aa7345cd76bb80370bbd900a00a7d1;p=apache

Use the new error bucket to report HTTP_RANGE_NOT_SATISFIABLE from
the byterange filter.  This is much safer than returning the error
directly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87884 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 2317a56b46..b66254bccc 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -235,7 +235,12 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_byterange_filter(
  
         if (num_ranges == -1) {
             ap_remove_output_filter(f);
-            return HTTP_RANGE_NOT_SATISFIABLE;
+            bsend = apr_brigade_create(r->pool);
+            e = ap_bucket_create_error(HTTP_RANGE_NOT_SATISFIABLE, NULL, r->pool);
+            APR_BRIGADE_INSERT_TAIL(bsend, e);
+            e = apr_bucket_create_eos();
+            APR_BRIGADE_INSERT_TAIL(bsend, e);
+            return ap_pass_brigade(f->next, bsend);
         }
         if (num_ranges == 0) {
             ap_remove_output_filter(f);