diff options
author | Bill Stoddard <stoddard@apache.org> | 2002-01-29 20:02:04 +0100 |
---|---|---|
committer | Bill Stoddard <stoddard@apache.org> | 2002-01-29 20:02:04 +0100 |
commit | 4168820850f74e0b1cbe58be6acddfb1a86d7746 (patch) | |
tree | bafe3442764a5a70951f3a3fe2d0b3168a0a3cc9 /modules/http/http_core.c | |
parent | configuration change. (diff) | |
download | apache2-4168820850f74e0b1cbe58be6acddfb1a86d7746.tar.xz apache2-4168820850f74e0b1cbe58be6acddfb1a86d7746.zip |
This patch restores most of Ryan's patch (11/12/2001) to remove the
client_socket from the conn_rec. Diffs from Ryan's patch include:
- rename the create_connection hook to install_transport_filters
- move the point of invocation of the hook till after the call to
after ap_update_vhost_given_ip to enable the hook to use vhost
config info in its decision making.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93087 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http/http_core.c')
-rw-r--r-- | modules/http/http_core.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 64a58d39b0..c8659ae6ae 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -266,12 +266,7 @@ static const char *http_method(const request_rec *r) static apr_port_t http_port(const request_rec *r) { return DEFAULT_HTTP_PORT; } -static int ap_pre_http_connection(conn_rec *c) -{ - ap_add_input_filter_handle(ap_core_input_filter_handle, NULL, NULL, c); - ap_add_output_filter_handle(ap_core_output_filter_handle, NULL, NULL, c); - return OK; -} + static int ap_process_http_connection(conn_rec *c) { request_rec *r; @@ -321,8 +316,6 @@ static void ap_http_insert_filter(request_rec *r) static void register_hooks(apr_pool_t *p) { - ap_hook_pre_connection(ap_pre_http_connection,NULL,NULL, - APR_HOOK_REALLY_LAST); ap_hook_process_connection(ap_process_http_connection,NULL,NULL, APR_HOOK_REALLY_LAST); ap_hook_map_to_storage(ap_send_http_trace,NULL,NULL,APR_HOOK_MIDDLE); |