httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Mon, 15 Sep 2003 15:40:06 GMT
trawick     2003/09/15 08:40:06

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               support  Tag: APACHE_2_0_BRANCH ab.c
  Log:
  merge this fix from 2.1-dev:
  
  *) ab: Work over non-loopback on Unix again. PR 21495.
  
  The CHANGES entry is currently under the 2.0.48 heading.  We
  can figure out what to change once 2.0.48 is out the door.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.151 +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.150
  retrieving revision 1.988.2.151
  diff -u -r1.988.2.150 -r1.988.2.151
  --- CHANGES	5 Sep 2003 21:26:55 -0000	1.988.2.150
  +++ CHANGES	15 Sep 2003 15:40:05 -0000	1.988.2.151
  @@ -1,5 +1,7 @@
   Changes with Apache 2.0.48
   
  +  *) ab: Work over non-loopback on Unix again. PR 21495. [Jeff Trawick]
  +
     *) Fix a misleading message from the some of the threaded MPMs when 
        MaxClients has to be lowered due to the setting of ServerLimit.  
        [Jeff Trawick]
  
  
  
  1.751.2.466 +4 -12     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.465
  retrieving revision 1.751.2.466
  diff -u -r1.751.2.465 -r1.751.2.466
  --- STATUS	15 Sep 2003 11:49:19 -0000	1.751.2.465
  +++ STATUS	15 Sep 2003 15:40:05 -0000	1.751.2.466
  @@ -274,17 +274,9 @@
           modules/generators/mod_autoindex.c r1.120
         +1: nd, trawick
   
  -    * ab: Handle conditions where connect() on non-blocking socket
  -      doesn't complete immediately (i.e., restore functionality when
  -      benchmarking non-local targets).  This doesn't resolve some
  -      serious flaws in state-handling within ab; it is simply a
  -      minimal change to get it going again, as fixing it correctly is
  -      potentially destabilizing and may take some iterations in
  -      2.1-dev before it is ready for prime time.
  -        support/ab.c: r1.128
  -      +1: trawick, stoddard, brianp
  -
  -      More fixes
  +    * More ab fixes; r1.129 fixes what looks like a trivial error in the 
  +      SSL support; r1.130 adds some state-handling fixes related to
  +      ab's breakage in 2.0.47
           support/ab.c: r1.129, r1.130
         +1: trawick, brianp
   
  
  
  
  No                   revision
  No                   revision
  1.121.2.4 +3 -3      httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.121.2.3
  retrieving revision 1.121.2.4
  diff -u -r1.121.2.3 -r1.121.2.4
  --- ab.c	31 Jul 2003 20:23:21 -0000	1.121.2.3
  +++ ab.c	15 Sep 2003 15:40:06 -0000	1.121.2.4
  @@ -1256,7 +1256,7 @@
   	    c->state = STATE_CONNECTING;
   	    c->rwrite = 0;
               new_pollfd.desc_type = APR_POLL_SOCKET;
  -            new_pollfd.reqevents = APR_POLLIN;
  +            new_pollfd.reqevents = APR_POLLOUT | APR_POLLIN;
               new_pollfd.desc.s = c->aprsock;
               new_pollfd.client_data = c;
   	    apr_pollset_add(readbits, &new_pollfd);
  
  
  

Mime
View raw message