Classify some of the input filters as the correct types. Previous to

this patch, the type wasn't too important, because all filters were
put on the same list.  After this patch, the filter type is very important,
because there are three different types of filters, and they are all treated
differently, namely:

CONNECTION:	Filters of this type are valid for the lifetime of this
		connection.
PROTOCOL:	Filters of this type are valid for the lifetime of this
		request from the point of view of the client, this means
		that the request is valid from the time that the request
		is sent until the time that the response is received.
CONTENT:	Filters of this type are valid for the time that this
		content is used to satisfy a request.  For simple requests,
		this is identical to PROTOCOL, but internal redirects
		and sub-requests can change the content without ending
		the request.

It is important to realize that the three major types above are actually
broken down into smaller groups in the code, to ensure that the ordering
of filters is always correct.

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index c8659ae6aed9fb621c63e06d2623a27d4d9d6c3b..cbd05a6ac823fc15c84bae35981379ae430c437e 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -324,7 +324,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_insert_filter(ap_http_insert_filter, NULL, NULL, APR_HOOK_REALLY_LAST);
     ap_http_input_filter_handle =
         ap_register_input_filter("HTTP_IN", ap_http_filter,
-                                 AP_FTYPE_CONNECTION);
+                                 AP_FTYPE_HTTP_HEADER);
     ap_http_header_filter_handle =
         ap_register_output_filter("HTTP_HEADER", ap_http_header_filter, 
                                   AP_FTYPE_HTTP_HEADER);

diff --git a/server/core.c b/server/core.c
index 0621294e3311d1220a1bc02960c618f38074b48f..3b173cdc606c5fe0b958424a8b9767c5207b76b8 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3885,7 +3885,7 @@ static void register_hooks(apr_pool_t *p)
                                  AP_FTYPE_NETWORK);
     ap_net_time_filter_handle =
         ap_register_input_filter("NET_TIME", net_time_filter,
-                                 AP_FTYPE_CONTENT);
+                                 AP_FTYPE_HTTP_HEADER);
     ap_content_length_filter_handle =
         ap_register_output_filter("CONTENT_LENGTH", ap_content_length_filter, 
                                   AP_FTYPE_HTTP_HEADER);