You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2002/01/30 05:34:11 UTC
cvs commit: httpd-2.0/modules/proxy mod_proxy.h proxy_ftp.c proxy_http.c proxy_util.c
stoddard 02/01/29 20:34:11
Modified: modules/proxy mod_proxy.h proxy_ftp.c proxy_http.c
proxy_util.c
Log:
Cleanup some fallout from the recent install_transport_filters commit.
Deprecate ap_proxy_pre_http_connection.
Revision Changes Path
1.69 +0 -1 httpd-2.0/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mod_proxy.h 29 Jan 2002 21:08:37 -0000 1.68
+++ mod_proxy.h 30 Jan 2002 04:34:11 -0000 1.69
@@ -262,7 +262,6 @@
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);
1.93 +2 -3 httpd-2.0/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- proxy_ftp.c 29 Jan 2002 17:56:42 -0000 1.92
+++ proxy_ftp.c 30 Jan 2002 04:34:11 -0000 1.93
@@ -815,7 +815,7 @@
*/
/* 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 @@
}
/* set up the connection filters */
- ap_proxy_pre_http_connection(data);
-
+ ap_run_install_transport_filters(data, data_sock);
/*
* VI: Receive the Response ------------------------
1.125 +1 -1 httpd-2.0/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- proxy_http.c 29 Jan 2002 21:08:37 -0000 1.124
+++ proxy_http.c 30 Jan 2002 04:34:11 -0000 1.125
@@ -444,7 +444,7 @@
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;
}
1.80 +0 -6 httpd-2.0/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- proxy_util.c 25 Jan 2002 01:11:47 -0000 1.79
+++ proxy_util.c 30 Jan 2002 04:34:11 -0000 1.80
@@ -980,12 +980,6 @@
}
/* 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);