More fixes...

PR:
Obtained from:
Reviewed by:

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index ff4195021bf1c8b698adb20014fb891bd34c37fb..1caf8359c856e90680b289ce8840031a443bdaf9 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -721,7 +721,6 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_translate_name(proxy_trans, NULL, NULL, APR_HOOK_FIRST);
     /* filters */
     ap_register_output_filter("PROXY_SEND_DIR", ap_proxy_send_dir_filter, AP_FTYPE_CONNECTION);
-    ap_register_output_filter("PROXY_NULL", ap_proxy_null_filter, AP_FTYPE_NETWORK);
     /* fixups */
     ap_hook_fixups(proxy_fixup, NULL, NULL, APR_HOOK_FIRST);
     /* post read_request handling */

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index e34ef81735a3deec00d077a5d8f657e2edfecc45..7fefb5c0bf0ab6702cd9bb078362dacd20499fa7 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -203,7 +203,6 @@ typedef struct {
 
 int ap_proxy_connect_handler(request_rec *r, char *url,
                          const char *proxyhost, int proxyport);
-apr_status_t ap_proxy_null_filter(ap_filter_t *f, apr_bucket_brigade *bb);
 
 /* proxy_ftp.c */
 

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index 975bd1e0eb1e80a0f69ecf01c66a3073f6d88b1f..b6adb024d2e065571246db88bc5c90581fdec45e 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -99,12 +99,6 @@ allowed_port(proxy_server_conf *conf, int port)
     return 0;
 }
 
-/* a NULL filter for the connect tunnel */
-apr_status_t ap_proxy_null_filter(ap_filter_t *f, apr_bucket_brigade *bb)
-{
-    return APR_SUCCESS;
-}
-
 int ap_proxy_connect_handler(request_rec *r, char *url,
                          const char *proxyname, int proxyport)
 {
@@ -262,7 +256,6 @@ int ap_proxy_connect_handler(request_rec *r, char *url,
      */
     r->output_filters = NULL;
     r->connection->output_filters = NULL;
-    ap_add_output_filter("PROXY_NULL", NULL, r, r->connection);
 
 
     /* If we are connecting through a remote proxy, we need to pass