httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_ftp.c
Date Wed, 09 Jul 2003 10:59:57 GMT
striker     2003/07/09 03:59:57

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               modules/proxy Tag: APACHE_2_0_BRANCH proxy_ftp.c
  Log:
  Commit the patch for CAN-2003-0254.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.126 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.125
  retrieving revision 1.988.2.126
  diff -u -r1.988.2.125 -r1.988.2.126
  --- CHANGES	9 Jul 2003 10:57:03 -0000	1.988.2.125
  +++ CHANGES	9 Jul 2003 10:59:55 -0000	1.988.2.126
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.47
   
  +  *) SECURITY [CAN-2003-0254]: Fixed a bug in ftp proxy causing denial
  +     of service when target host is IPv6 but proxy server can't create
  +     IPv6 socket.  Fixed by the reporter.  [Yoshioka Tsuneo
  +     <tsuneo.yoshioka@f-secure.com>]
  +
     *) SECURITY [VU#379828] Prevent the server from crashing when entering
        infinite loops. The new LimitInternalRecursion directive configures
        limits of subsequent internal redirects and nested subrequests, after
  
  
  
  No                   revision
  No                   revision
  1.130.2.2 +2 -0      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.130.2.1
  retrieving revision 1.130.2.2
  diff -u -r1.130.2.1 -r1.130.2.2
  --- proxy_ftp.c	3 Feb 2003 17:31:50 -0000	1.130.2.1
  +++ proxy_ftp.c	9 Jul 2003 10:59:56 -0000	1.130.2.2
  @@ -957,6 +957,7 @@
   	    if ((rv = apr_socket_create(&sock, connect_addr->family, SOCK_STREAM, r->pool))
!= APR_SUCCESS) {
   		ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
   			      "proxy: FTP: error creating socket");
  +                connect_addr = connect_addr->next;
   		continue;
   	    }
   
  @@ -974,6 +975,7 @@
   #ifndef _OSD_POSIX              /* BS2000 has this option "always on" */
   		ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
   			      "proxy: FTP: error setting reuseaddr option: apr_socket_opt_set(APR_SO_REUSEADDR)");
  +                connect_addr = connect_addr->next;
   		continue;
   #endif                          /* _OSD_POSIX */
   	    }
  
  
  

Mime
View raw message