back out filter change that is preventing headers to be sent

PR:
Obtained from:
Submitted by: john sterling
Reviewed by:	dougm

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index e3f2c1e496e74f4d1d26b1290bbe7f7a00b7a258..f59e2533d309a0c1497ebb6383e18ab2ccc6a0ac 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -295,13 +295,6 @@ static int ap_process_http_connection(conn_rec *c)
     return OK;
 }
 
-static void ap_http_insert_filter(request_rec *r)
-{
-    ap_add_output_filter("BYTERANGE", NULL, r, r->connection);
-    ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
-    ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
-}
-
 static void register_hooks(apr_pool_t *p)
 {
     ap_hook_pre_connection(ap_pre_http_connection,NULL,NULL,
@@ -311,7 +304,6 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_http_method(http_method,NULL,NULL,APR_HOOK_REALLY_LAST);
     ap_hook_default_port(http_port,NULL,NULL,APR_HOOK_REALLY_LAST);
 
-    ap_hook_insert_filter(ap_http_insert_filter, NULL, NULL, APR_HOOK_REALLY_LAST);
     ap_register_input_filter("HTTP_IN", ap_http_filter, AP_FTYPE_CONNECTION);
     ap_register_input_filter("DECHUNK", ap_dechunk_filter, AP_FTYPE_TRANSCODE);
     ap_register_output_filter("HTTP_HEADER", ap_http_header_filter, 

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 735c1e6d72bf74bf102f1187b462c8fa552e470d..4f4af75b8a0f01ab0c1a64544e12179260a27094 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -517,6 +517,10 @@ static request_rec *internal_internal_redirect(const char *new_uri,
     new->output_filters  = r->connection->output_filters;
     new->input_filters   = r->connection->input_filters;
 
+    ap_add_output_filter("BYTERANGE", NULL, new, new->connection);
+    ap_add_output_filter("CONTENT_LENGTH", NULL, new, new->connection);
+    ap_add_output_filter("HTTP_HEADER", NULL, new, new->connection);
+      
     apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
        apr_psprintf(r->pool, "%d", r->status));
 

diff --git a/server/protocol.c b/server/protocol.c
index 987e01c4b67c681f871ab4970460bc79fffaff0b..98564c999d404a95488235e25c752920d5a91cd3 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -590,6 +590,11 @@ request_rec *ap_read_request(conn_rec *conn)
                      ? r->server->keep_alive_timeout * APR_USEC_PER_SEC
                      : r->server->timeout * APR_USEC_PER_SEC));
                      
+    ap_add_output_filter("BYTERANGE", NULL, r, r->connection);
+    ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
+    ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
+       
+         
     /* Get the request... */
     if (!read_request_line(r)) {
         if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {