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/server connection.c
Date Tue, 25 Feb 2003 23:25:21 GMT
stas        2003/02/25 15:25:20

  Modified:    server   connection.c
  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
  1.108     +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.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- connection.c	3 Feb 2003 17:53:18 -0000	1.107
  +++ connection.c	25 Feb 2003 23:25:19 -0000	1.108
  @@ -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);
       }
  
  
  

Mime
View raw message