Fix problem reported by Taketo Kabe <kabe@sra-tohoku.co.jp>

where HEAD response headers were being repeated twice for
files greater than 32K bytes (4*AP_MIN_BYTES_TO_WRITE). This
problem in the http_header filter was exposed by the recent rewrite
of the content_length filter.
[Taketo Kabe, Bill Stoddard]

PR: 8037

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

diff --git a/CHANGES b/CHANGES
index 2a90fd27d1f389814df1f42ff8c8a04947f9a6bc..f4599190539bc78db0c82cc478b9c142f4f7d5d7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,14 @@
 Changes with Apache 2.0.22-dev
- 
+  *) Fix problem reported by Taketo Kabe <kabe@sra-tohoku.co.jp>
+     where HEAD response headers were being repeated twice for
+     files greater than 32K bytes (4*AP_MIN_BYTES_TO_WRITE). This
+     problem in the http_header filter was exposed by the recent rewrite
+     of the content_length filter. [Taketo Kabe, Bill Stoddard]
+
   *) Fix seg faults in mod_status with ExtendedStatus enabled, after
      restarts.  A garbage pointer to a vhost's server_rec from the
      previous generation was being left around under certain
-     conditions.
+     conditions. [Greg Ames]
 
   *) Fix a cosmetic problem with mod_include.  Non-existant SSI vars
      used to appear as '(none', without the closing paren.

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index b3b60cc155307d8b7bda39bae48afe371d6ae680..0a2469aa687b5e0fb505743242e449b688f643a2 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1212,6 +1212,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(
 
     if (r->header_only) {
         apr_brigade_destroy(b);
+        ap_remove_output_filter(f);
         return OK;
     }