Fix Win32 compile break introduced by the http_header filter code.

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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index efbf29f71a26836cb8d6b6be0e04270ce8fbd2bb..3cdf4d720286602d23f3d2b5d8085e1f5f16936d 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -112,7 +112,7 @@ AP_DECLARE(void) ap_basic_http_header(request_rec *r);
  */
 AP_DECLARE(void) ap_send_http_header(request_rec *l);
 
-AP_CORE_DECLARE(int) ap_http_header_filter(ap_filter_t *f, ap_bucket_brigade *b);
+AP_CORE_DECLARE_NONSTD(int) ap_http_header_filter(ap_filter_t *f, ap_bucket_brigade *b);
 
 /* Send the response to special method requests */
 

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index e2dfc84bd787664f69ffaa0d903c90f327fb6c34..27119385328829f14ec1b2ea7930e49d744eba12 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2221,7 +2221,7 @@ AP_DECLARE(void) ap_send_http_header(request_rec *r)
 {
 }
 
-AP_CORE_DECLARE(int) ap_http_header_filter(ap_filter_t *f, ap_bucket_brigade *b)
+AP_CORE_DECLARE_NONSTD(int) ap_http_header_filter(ap_filter_t *f, ap_bucket_brigade *b)
 {
     int i;
     const long int zero = 0L;
@@ -2266,8 +2266,8 @@ AP_CORE_DECLARE(int) ap_http_header_filter(ap_filter_t *f, ap_bucket_brigade *b)
         apr_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");
         apr_table_unset(r->headers_out, "Content-Length");
         /* Disable the buffer filter because it may be masking bugs in the 
-         * bucket brigade code 
-         * ap_add_output_filter("COALESCE", NULL, r, r->connection); */
+         * bucket brigade code  */
+        ap_add_output_filter("COALESCE", NULL, r, r->connection);
         ap_add_output_filter("CHUNK", NULL, r, r->connection);
     }