From: justdave%bugzilla.org <>
Date: Sun, 11 Feb 2007 08:12:24 +0000 (+0000)
Subject: Bug 369956: Have testserver.pl report whether or not the server is using mod_perl
X-Git-Tag: bugzilla-3.0rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbd72dff8696ab1ec64a6b0c31e982d2b3a8df3e;p=thirdparty%2Fbugzilla.git

Bug 369956: Have testserver.pl report whether or not the server is using mod_perl
r=mkanat, a=justdave
---

diff --git a/testagent.cgi b/testagent.cgi
index 2d558d2b98..4ecaa15fde 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 af4ba67e75..108a19ac28 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.