aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%bugzilla.org <>2007-02-11 08:12:24 +0000
committerjustdave%bugzilla.org <>2007-02-11 08:12:24 +0000
commitcbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e (patch)
tree39ad7b0cfa876624c297af718f7625047e06d922
parent2f97f350c6548ea2cec674659f9034d146b99eb3 (diff)
downloadbugs-cbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e.tar
bugs-cbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e.tar.gz
bugs-cbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e.tar.bz2
bugs-cbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e.tar.xz
bugs-cbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e.zip
Bug 369956: Have testserver.pl report whether or not the server is using mod_perl
r=mkanat, a=justdave
-rwxr-xr-xtestagent.cgi2
-rwxr-xr-xtestserver.pl4
2 files changed, 3 insertions, 3 deletions
diff --git a/testagent.cgi b/testagent.cgi
index 2d558d2b9..4ecaa15fd 100755
--- a/testagent.cgi
+++ b/testagent.cgi
@@ -19,6 +19,6 @@
use strict;
print "content-type:text/plain\n\n";
-print "OK\n";
+print "OK " . ($::ENV{MOD_PERL} || "mod_cgi") . "\n";
exit;
diff --git a/testserver.pl b/testserver.pl
index af4ba67e7..108a19ac2 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -107,8 +107,8 @@ Check your webserver configuration and try again.\n";
# Try to execute a cgi script
my $response = fetch($ARGV[0] . "/testagent.cgi");
-if ($response =~ /^OK/) {
- print "TEST-OK Webserver is executing CGIs.\n";
+if ($response =~ /^OK (.*)$/) {
+ print "TEST-OK Webserver is executing CGIs via $1.\n";
} elsif ($response =~ /^#!/) {
print
"TEST-FAILED Webserver is fetching rather than executing CGI files.