www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Cleanup some fallout from the recent install_transport_filters commit.

Browse Source 
Deprecate ap_proxy_pre_http_connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93093 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bill Stoddard
2002-01-30 04:34:11 +00:00
parent f153bf8a14
commit 4bc1733b38
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/proxy/mod_proxy.h
View File

@@ -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_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_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_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(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(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); PROXY_DECLARE(void) ap_proxy_reset_output_filters(conn_rec *c);

5
modules/proxy/proxy_ftp.c
View File

@@ -815,7 +815,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
*/ */
/* set up the connection filters */ /* set up the connection filters */
ap_proxy_pre_http_connection(origin); ap_run_install_transport_filters(origin, sock);
/* possible results: */ /* possible results: */
/* 120 Service ready in nnn minutes. */ /* 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 */ /* set up the connection filters */
ap_proxy_pre_http_connection(data); ap_run_install_transport_filters(data, data_sock);
/* /*
* VI: Receive the Response ------------------------ * VI: Receive the Response ------------------------

2
modules/proxy/proxy_http.c
View File

@@ -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); p_conn->addr, p_conn->name);
/* set up the connection filters */ /* set up the connection filters */
ap_proxy_pre_http_connection(*origin); ap_run_install_transport_filters(*origin, p_conn->sock);
} }
return OK; return OK;
} }

6
modules/proxy/proxy_util.c
View File

@@ -980,12 +980,6 @@ PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *c
} }
/* set up the minimal filter set */ /* 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) PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r)
{ {
ap_add_input_filter("HTTP_IN", NULL, r, c); ap_add_input_filter("HTTP_IN", NULL, r, c);