Cleanup some fallout from the recent install_transport_filters commit.

Deprecate ap_proxy_pre_http_connection.

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

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index f81dfa4c61b128eee5591fbad08f48944efc5ce8..c0061be3c7ad0077bb6c5d63927d2fd52a602655 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -262,7 +262,6 @@ PROXY_DECLARE(int) ap_proxy_is_domainname(struct dirconn_entry *This, apr_pool_t
 PROXY_DECLARE(int) ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t *p);
 PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);
 PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t *uri_addr);
-PROXY_DECLARE(int) ap_proxy_pre_http_connection(conn_rec *c);
 PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r);
 PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen, int *eos);
 PROXY_DECLARE(void) ap_proxy_reset_output_filters(conn_rec *c);

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 523deea1323c7a287bf5eece74eea10e2214b1aa..352a46053e8289bbcc9021fe3fd0fd074a6d0595 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -815,7 +815,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
      */
 
     /* set up the connection filters */
-    ap_proxy_pre_http_connection(origin);
+    ap_run_install_transport_filters(origin, sock);
 
     /* possible results: */
     /* 120 Service ready in nnn minutes. */
@@ -1604,8 +1604,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     }
 
     /* set up the connection filters */
-    ap_proxy_pre_http_connection(data);
-
+    ap_run_install_transport_filters(data, data_sock);
 
     /*
      * VI: Receive the Response ------------------------

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 29887e08906087a28c71076f9e35af7f9d42273d..e2ff34341a1ec54d9ed5522125b72e8501ffa1fa 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -444,7 +444,7 @@ apr_status_t ap_proxy_http_create_connection(apr_pool_t *p, request_rec *r,
                      p_conn->addr, p_conn->name);
 
         /* set up the connection filters */
-        ap_proxy_pre_http_connection(*origin);
+        ap_run_install_transport_filters(*origin, p_conn->sock);
     }
     return OK;
 }

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 0c3a85e3e4ddd1b78a587268ebb25213d9c997e4..91ff75c0a8ef0c2c6a47274bd84ecf83b90cc837 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -980,12 +980,6 @@ PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *c
 }
 
 /* set up the minimal filter set */
-PROXY_DECLARE(int) ap_proxy_pre_http_connection(conn_rec *c)
-{
-    ap_add_input_filter("CORE_IN", NULL, NULL, c);
-    ap_add_output_filter("CORE", NULL, NULL, c);
-    return OK;
-}
 PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r)
 {
     ap_add_input_filter("HTTP_IN", NULL, r, c);