httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
Date Wed, 11 Aug 2004 13:19:26 GMT
jorton      2004/08/11 06:19:26

  Modified:    .        CHANGES
               modules/ssl ssl_engine_io.c
  Log:
  * modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential
  infinite loop in ssl_io_input_getline if connection is aborted without
  inctx->rc being set.
  
  PR: 29964
  
  Revision  Changes    Path
  1.1548    +4 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1547
  retrieving revision 1.1548
  diff -d -w -u -r1.1547 -r1.1548
  --- CHANGES	5 Aug 2004 19:20:18 -0000	1.1547
  +++ CHANGES	11 Aug 2004 13:19:21 -0000	1.1548
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) SECURITY: CAN-2004-0748 (cve.mitre.org)
  +     mod_ssl: Fix a potential infinite loop.  PR 29964.  [Joe Orton]
  +
     *) mod_disk_cache: Implement binary format for on-disk header files.
        [Brian Akins <bakins web.turner.com>, Justin Erenkrantz]
   
  @@ -20,7 +23,7 @@
     *) Add load balancer support to the scoreboard in preparation for
        load balancing support in mod_proxy. [Mladen Turk]
   
  -  *) mod_ssl: Build on RHEL 3. (RedHat bug: 82369.)  [Justin Erenkrantz]
  +  *) mod_ssl: Build on RHEL 3.  PR 18989.  [Justin Erenkrantz]
   
     *) mod_nw_ssl: Added the directive NWSSLUpgradeable to mod_nw_ssl to 
        allow a non-secure connection to be upgraded to secure connections
  
  
  
  1.125     +4 -0      httpd-2.0/modules/ssl/ssl_engine_io.c
  
  Index: ssl_engine_io.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -d -w -u -r1.124 -r1.125
  --- ssl_engine_io.c	13 Jul 2004 18:11:22 -0000	1.124
  +++ ssl_engine_io.c	11 Aug 2004 13:19:24 -0000	1.125
  @@ -589,6 +589,10 @@
       while (1) {
   
           if (!inctx->filter_ctx->pssl) {
  +            /* Ensure a non-zero error code is returned */
  +            if (inctx->rc == APR_SUCCESS) {
  +                inctx->rc = APR_EGENERAL;
  +            }
               break;
           }
   
  
  
  

Mime
View raw message