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 2d558d2b984e3799d6ad5802fc2d2290bb474c34..4ecaa15fdebe07c3afaf677a8cd7d0a88b08b649 100755 (executable)
--- 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 af4ba67e75395560b568aec65f42713ee5cae01b..108a19ac28b3c8ddb8e99bcc5d10c3cd1db3b198 100755 (executable)
--- 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.