geoff 2003/10/01 06:45:23
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestServer.pm
Log:
Apache 1.3 servers now run in standard prefork mode under
normal operation. single server mode (httpd -X) was replaced
with MaxClients set to 1 by default.
Reviewed by: stas
Revision Changes Path
1.175 +6 -0
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.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- TestConfig.pm 22 Sep 2003 22:03:31 -0000 1.174
+++ TestConfig.pm 1 Oct 2003 13:45:23 -0000 1.175
@@ -1711,6 +1711,12 @@
MaxRequestsPerChild 0
</IfModule>
+<IfDefine APACHE1>
+ StartServers 1
+ MaxClients @MaxClients@
+ MaxRequestsPerChild 0
+</IfDefine>
+
<IfModule mpm_winnt.c>
ThreadsPerChild 20
MaxRequestsPerChild 0
1.66 +1 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Index: TestServer.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- TestServer.pm 18 Sep 2003 07:39:35 -0000 1.65
+++ TestServer.pm 1 Oct 2003 13:45:23 -0000 1.66
@@ -104,9 +104,8 @@
sub start_cmd {
my $self = shift;
#XXX: threaded mpm does not respond to SIGTERM with -DONE_PROCESS
- my $one = $self->{rev} == 1 ? '-X' : '';
my $args = $self->args;
- return "$self->{config}->{vars}->{httpd} $one $args";
+ return "$self->{config}->{vars}->{httpd} $args";
}
sub default_gdbinit {
