httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker pod.c
Date Thu, 20 Mar 2003 21:56:07 GMT
wrowe       2003/03/20 13:56:07

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               modules/loggers Tag: APACHE_2_0_BRANCH mod_log_config.c
               modules/mappers Tag: APACHE_2_0_BRANCH mod_rewrite.c
               server   Tag: APACHE_2_0_BRANCH log.c mpm_common.c
               server/mpm/worker Tag: APACHE_2_0_BRANCH pod.c
  Log:
  SECURITY:  Eliminated leaks of several file descriptors to child
  processes, such as CGI scripts.
  
  PR: 17206
  Submitted by:	Christian Kratzer <ck@cksoft.de>, Bjoern A. Zeeb <bz@zabbadoz.net>
  Reviewed by:	Joe Orton, Will Rowe
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.64 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.63
  retrieving revision 1.988.2.64
  diff -u -r1.988.2.63 -r1.988.2.64
  --- CHANGES	19 Mar 2003 12:50:55 -0000	1.988.2.63
  +++ CHANGES	20 Mar 2003 21:56:01 -0000	1.988.2.64
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.45
   
  +  *) SECURITY:  Eliminated leaks of several file descriptors to child
  +     processes, such as CGI scripts.  This fix depends on the latest
  +     APR library release 0.9.2, which is distributed with the httpd 
  +     source tarball for Apache 2.0.45.  PR 17206
  +     [Christian Kratzer <ck@cksoft.de>, Bjoern A. Zeeb <bz@zabbadoz.net>]
  +
     *) Prevent endless loops of internal redirects in mod_rewrite by
        aborting after exceeding a limit of internal redirects. The
        limit defaults to 10 and can be changed using the RewriteOptions
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.95.2.4  +0 -1      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.95.2.3
  retrieving revision 1.95.2.4
  diff -u -r1.95.2.3 -r1.95.2.4
  --- mod_log_config.c	13 Feb 2003 13:54:04 -0000	1.95.2.3
  +++ mod_log_config.c	20 Mar 2003 21:56:03 -0000	1.95.2.4
  @@ -1285,7 +1285,6 @@
                               "could not open transfer log file %s.", fname);
               return NULL;
           }
  -        apr_file_inherit_set(fd);
           return fd;
       }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.135.2.7 +0 -1      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.135.2.6
  retrieving revision 1.135.2.7
  diff -u -r1.135.2.6 -r1.135.2.7
  --- mod_rewrite.c	19 Mar 2003 12:50:57 -0000	1.135.2.6
  +++ mod_rewrite.c	20 Mar 2003 21:56:04 -0000	1.135.2.7
  @@ -3321,7 +3321,6 @@
                            "file %s", fname);
               exit(1);
           }
  -        apr_file_inherit_set(conf->rewritelogfp);
       }
       return;
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.127.2.3 +0 -2      httpd-2.0/server/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/log.c,v
  retrieving revision 1.127.2.2
  retrieving revision 1.127.2.3
  diff -u -r1.127.2.2 -r1.127.2.3
  --- log.c	15 Feb 2003 01:21:31 -0000	1.127.2.2
  +++ log.c	20 Mar 2003 21:56:06 -0000	1.127.2.3
  @@ -320,8 +320,6 @@
                            ap_server_argv0, fname);
               return DONE;
           }
  -
  -        apr_file_inherit_set(s->error_log);
       }
   
       return OK;
  
  
  
  1.102.2.2 +4 -0      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.102.2.1
  retrieving revision 1.102.2.2
  diff -u -r1.102.2.1 -r1.102.2.2
  --- mpm_common.c	3 Feb 2003 17:32:00 -0000	1.102.2.1
  +++ mpm_common.c	20 Mar 2003 21:56:06 -0000	1.102.2.2
  @@ -410,6 +410,10 @@
       apr_sockaddr_info_get(&(*pod)->sa, ap_listeners->bind_addr->hostname,
                             APR_UNSPEC, ap_listeners->bind_addr->port, 0, p);
   
  +    /* close these before exec. */
  +    apr_file_unset_inherit((*pod)->pod_in);
  +    apr_file_unset_inherit((*pod)->pod_out);
  +
       return APR_SUCCESS;
   }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.2   +4 -0      httpd-2.0/server/mpm/worker/pod.c
  
  Index: pod.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/pod.c,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- pod.c	3 Feb 2003 17:32:07 -0000	1.6.2.1
  +++ pod.c	20 Mar 2003 21:56:06 -0000	1.6.2.2
  @@ -76,6 +76,10 @@
   */
       (*pod)->p = p;
       
  +    /* close these before exec. */
  +    apr_file_unset_inherit((*pod)->pod_in);
  +    apr_file_unset_inherit((*pod)->pod_out);
  +
       return APR_SUCCESS;
   }
   
  
  
  

Mime
View raw message