httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sterling <sterl...@covalent.net>
Subject [PATCH] option 2: backout changes that cause 'no headers'
Date Tue, 29 May 2001 18:59:45 GMT
Since there needs to be some design work to figure out the best place to
insert the header filters, i suggest we backout the change that inserts
them in the 'insert filters' phase -

here is a patch for it, in case you don't want to just undo the original
commit:


Index: modules/http/http_core.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/http/http_core.c,v
retrieving revision 1.276
diff -u -r1.276 http_core.c
--- modules/http/http_core.c	2001/05/21 23:47:15	1.276
+++ modules/http/http_core.c	2001/05/29 18:28:47
@@ -295,13 +295,6 @@
     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 @@
     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, 
Index: modules/http/http_request.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/http/http_request.c,v
retrieving revision 1.99
diff -u -r1.99 http_request.c
--- modules/http/http_request.c	2001/05/21 23:47:16	1.99
+++ modules/http/http_request.c	2001/05/29 18:28:47
@@ -517,6 +517,10 @@
     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));
 
Index: server/protocol.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/protocol.c,v
retrieving revision 1.22
diff -u -r1.22 protocol.c
--- server/protocol.c	2001/05/22 01:31:11	1.22
+++ server/protocol.c	2001/05/29 18:29:21
@@ -590,6 +590,11 @@
                      ? 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) {
       


Mime
View raw message