httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Tue, 25 Feb 2003 23:33:55 GMT
stas        2003/02/25 15:33:55

  Modified:    server   Tag: APACHE_2_0_BRANCH connection.c
               .        Tag: APACHE_2_0_BRANCH CHANGES
  Log:
  check the return value of ap_run_pre_connection(). So if the
  pre_connection phase fails (without setting c->aborted)
  ap_run_process_connection is not executed.
  Reviewed by:	trawick, jim
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.2 +6 -2      httpd-2.0/server/connection.c
  
  Index: connection.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/connection.c,v
  retrieving revision 1.106.2.1
  retrieving revision 1.106.2.2
  diff -u -r1.106.2.1 -r1.106.2.2
  --- connection.c	3 Feb 2003 17:31:59 -0000	1.106.2.1
  +++ connection.c	25 Feb 2003 23:33:53 -0000	1.106.2.2
  @@ -199,10 +199,14 @@
   
   AP_CORE_DECLARE(void) ap_process_connection(conn_rec *c, void *csd)
   {
  +    apr_status_t rc;
       ap_update_vhost_given_ip(c);
   
  -    ap_run_pre_connection(c, csd);
  -
  +    rc = ap_run_pre_connection(c, csd);
  +    if (rc != OK && rc != DONE) {
  +        c->aborted = 1;
  +    }
  +    
       if (!c->aborted) {
           ap_run_process_connection(c);
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.43 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.42
  retrieving revision 1.988.2.43
  diff -u -r1.988.2.42 -r1.988.2.43
  --- CHANGES	24 Feb 2003 23:31:56 -0000	1.988.2.42
  +++ CHANGES	25 Feb 2003 23:33:54 -0000	1.988.2.43
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.45
   
  +  *) check the return value of ap_run_pre_connection(). So if the
  +     pre_connection phase fails (without setting c->aborted)
  +     ap_run_process_connection is not executed. [Stas Bekman]
  +
     *) Fixed a problem with mod_ldap which caused it to fault when caching
        was disabled.  Needed to make sure that the code did not
        attempt to use the cache if it didn't exist. Also fixed some memory
  
  
  

Mime
View raw message