Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 2 Apr 2002 04:30:49 -0000
Message-ID: <20020402043049.23528.qmail@icarus.apache.org>
From: dougm@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/proxy mod_proxy.h proxy_http.c
 proxy_util.c

dougm       02/04/01 20:30:49

  Modified:    modules/proxy mod_proxy.h proxy_http.c proxy_util.c
  Log:
  Reviewed by:	Ryan Bloom
  remove call to ap_proxy_reset_output_filters() and the function itself.
  this call breaks ssl proxy when the client is using keepalives.
  this function is also no longer needed with recent-ish filter changes.
  
  Revision  Changes    Path
  1.78      +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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mod_proxy.h	29 Mar 2002 07:29:11 -0000	1.77
  +++ mod_proxy.h	2 Apr 2002 04:30:49 -0000	1.78
  @@ -271,7 +271,6 @@
   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_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);
   PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key);
   PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, server_rec *, apr_pool_t *);
   PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c);
  
  
  
  1.143     +0 -3      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.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- proxy_http.c	30 Mar 2002 06:19:14 -0000	1.142
  +++ proxy_http.c	2 Apr 2002 04:30:49 -0000	1.143
  @@ -326,9 +326,6 @@
           p_conn->sock = client_socket;
           new = 0;
   
  -        /* reset the connection filters */
  -        ap_proxy_reset_output_filters(*origin);
  -
           /* save timeout */
           apr_getsocketopt(p_conn->sock, APR_SO_TIMEOUT, &current_timeout);
           /* set no timeout */
  
  
  
  1.88      +0 -19     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.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- proxy_util.c	22 Mar 2002 21:41:14 -0000	1.87
  +++ proxy_util.c	2 Apr 2002 04:30:49 -0000	1.88
  @@ -1062,25 +1062,6 @@
       return APR_SUCCESS;
   }
   
  -/* remove other filters (like DECHUNK) from filter stack */
  -PROXY_DECLARE(void) ap_proxy_reset_output_filters(conn_rec *c)
  -{
  -    ap_filter_t *f = c->output_filters;
  -
  -    while (f) {
  -        if (!strcasecmp(f->frec->name, "CORE") ||
  -            !strcasecmp(f->frec->name, "CONTENT_LENGTH") ||
  -            !strcasecmp(f->frec->name, "HTTP_HEADER")) {
  -            f = f->next;
  -            continue;
  -        }
  -        else {
  -            ap_remove_output_filter(f);
  -            f = f->next;
  -        }
  -    }
  -}
  -
   /* unmerge an element in the table */
   PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key)
   {