httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_util.c
Date Tue, 15 Apr 2003 16:07:47 GMT
minfrin     2003/04/15 09:07:46

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               modules/proxy Tag: APACHE_2_0_BRANCH proxy_util.c
  Log:
  Fixed a segfault when multiple ProxyBlock directives were used.
  PR:		19023
  Submitted by:	Sami Tikka <sami.tikka@f-secure.com>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.77 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.76
  retrieving revision 1.988.2.77
  diff -u -r1.988.2.76 -r1.988.2.77
  --- CHANGES	11 Apr 2003 20:22:20 -0000	1.988.2.76
  +++ CHANGES	15 Apr 2003 16:07:42 -0000	1.988.2.77
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.46
   
  +  *) Fixed a segfault when multiple ProxyBlock directives were used.
  +     PR: 19023 [Sami Tikka <sami.tikka@f-secure.com>]
  +
     *) SECURITY [CAN-2003-0134] OS2: Fix a Denial of Service vulnerability 
        identified and reported by Robert Howard <rihoward@rawbw.com> that 
        where device names faulted the running OS2 worker process.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.99.2.2  +2 -0      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.99.2.1
  retrieving revision 1.99.2.2
  diff -u -r1.99.2.1 -r1.99.2.2
  --- proxy_util.c	3 Feb 2003 17:31:50 -0000	1.99.2.1
  +++ proxy_util.c	15 Apr 2003 16:07:45 -0000	1.99.2.2
  @@ -1015,10 +1015,12 @@
                                apr_sockaddr_t *uri_addr)
   {
       int j;
  +    apr_sockaddr_t * src_uri_addr = uri_addr;
       /* XXX FIXME: conf->noproxies->elts is part of an opaque structure */
       for (j = 0; j < conf->noproxies->nelts; j++) {
           struct noproxy_entry *npent = (struct noproxy_entry *) conf->noproxies->elts;
           struct apr_sockaddr_t *conf_addr = npent[j].addr;
  +        uri_addr = src_uri_addr;
           ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                        "proxy: checking remote machine [%s] against [%s]", uri_addr->hostname,
npent[j].name);
           if ((npent[j].name && ap_strstr_c(uri_addr->hostname, npent[j].name))
  
  
  

Mime
View raw message