httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test Changes
Date Fri, 07 May 2004 17:59:23 GMT
stas        2004/05/07 10:59:23

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
               perl-framework/Apache-Test Changes
  Log:
  -minclients is now what -maxclients used to be, -maxclients is now
  really what it says it is
  
  Revision  Changes    Path
  1.223     +21 -10    httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.222
  retrieving revision 1.223
  diff -u -u -r1.222 -r1.223
  --- TestConfig.pm	16 Apr 2004 20:29:23 -0000	1.222
  +++ TestConfig.pm	7 May 2004 17:59:22 -0000	1.223
  @@ -75,7 +75,8 @@
      startup_timeout => 'seconds to wait for the server to start (default is 60)',
      httpd_conf      => 'inherit config from this file (default is apxs derived)',
      httpd_conf_extra=> 'inherit additional config from this file',
  -   maxclients      => 'maximum number of concurrent clients (default is 1)',
  +   minclients      => 'minimum number of concurrent clients (default is 1)',
  +   maxclients      => 'maximum number of concurrent clients (default is minclients+1)',
      perlpod         => 'location of perl pod documents (for testing downloads)',
      proxyssl_url    => 'url for testing ProxyPass / https (default is localhost)',
      sslca           => 'location of SSL CA (default is $t_conf/ssl/ca)',
  @@ -279,7 +280,11 @@
       $vars->{user}         ||= $self->default_user;
       $vars->{group}        ||= $self->default_group;
       $vars->{serveradmin}  ||= $self->default_serveradmin;
  -    $vars->{maxclients}   ||= 1;
  +
  +    $vars->{minclients}   ||= 1;
  +    # prevent 'server reached MaxClients setting' errors
  +    $vars->{maxclients}   ||= $vars->{minclients} + 1;
  +
       $vars->{proxy}        ||= 'off';
       $vars->{proxyssl_url} ||= '';
       $vars->{defines}      ||= '';
  @@ -403,6 +408,7 @@
   
       #if we proxy to ourselves, must bump the maxclients
       if ($vars->{proxy} =~ /^on$/i) {
  +        $vars->{minclients}++;
           $vars->{maxclients}++;
           $vars->{proxy} = $self->{vhosts}->{'mod_proxy'}->{hostport};
           return $vars->{proxy};
  @@ -1183,6 +1189,7 @@
           }
   
           if ($vars->{proxyssl_url}) {
  +            $vars->{minclients}++;
               $vars->{maxclients}++;
           }
       }
  @@ -1849,30 +1856,34 @@
   
   <IfModule @THREAD_MODULE@>
       StartServers         1
  +    MinSpareThreads      @MinClients@
  +    MaxSpareThreads      @MinClients@
  +    ThreadsPerChild      @MinClients@
       MaxClients           @MaxClients@
  -    MinSpareThreads      @MaxClients@
  -    MaxSpareThreads      @MaxClients@
  -    ThreadsPerChild      @MaxClients@
       MaxRequestsPerChild  0
   </IfModule>
   
   <IfModule perchild.c>
       NumServers           1
  -    StartThreads         @MaxClients@
  -    MinSpareThreads      @MaxClients@
  -    MaxSpareThreads      @MaxClients@
  +    StartThreads         @MinClients@
  +    MinSpareThreads      @MinClients@
  +    MaxSpareThreads      @MinClients@
       MaxThreadsPerChild   @MaxClients@
       MaxRequestsPerChild  0
   </IfModule>
   
   <IfModule prefork.c>
  -    StartServers         1
  +    StartServers         @MinClients@
  +    MinSpareServers      @MinClients@
  +    MaxSpareServers      @MinClients@
       MaxClients           @MaxClients@
       MaxRequestsPerChild  0
   </IfModule>
   
   <IfDefine APACHE1>
  -    StartServers         1
  +    StartServers         @MinClients@
  +    MinSpareServers      @MinClients@
  +    MaxSpareServers      @MinClients@
       MaxClients           @MaxClients@
       MaxRequestsPerChild  0
   </IfDefine>
  
  
  
  1.128     +3 -0      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -u -r1.127 -r1.128
  --- Changes	6 May 2004 19:11:33 -0000	1.127
  +++ Changes	7 May 2004 17:59:22 -0000	1.128
  @@ -8,6 +8,9 @@
   
   =item 1.11-dev
   
  +-minclients is now what -maxclients used to be, -maxclients is now
  +really what it says it is [Stas]
  +
   Fix Apache::TestRequest::lwp_as_string to work with LWP 5.79 [Stas]
   
   
  
  
  

Mime
View raw message