httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r109970 - /httpd/test/trunk/perl-framework/t/modules/proxy.t
Date Mon, 06 Dec 2004 11:07:39 GMT
Author: jorton
Date: Mon Dec  6 03:07:36 2004
New Revision: 109970

URL: http://svn.apache.org/viewcvs?view=rev&rev=109970
Log:
Use have_cgi for run with mod_cgid too, skip 1xx passthrough
tests with <2.1.0.

Modified:
   httpd/test/trunk/perl-framework/t/modules/proxy.t

Modified: httpd/test/trunk/perl-framework/t/modules/proxy.t
Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/proxy.t?view=diff&rev=109970&p1=httpd/test/trunk/perl-framework/t/modules/proxy.t&r1=109969&p2=httpd/test/trunk/perl-framework/t/modules/proxy.t&r2=109970
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/proxy.t	(original)
+++ httpd/test/trunk/perl-framework/t/modules/proxy.t	Mon Dec  6 03:07:36 2004
@@ -15,7 +15,7 @@
 ok t_cmp($r->code, 200, "reverse proxy to index.html");
 ok t_cmp($r->content, qr/^welcome to /, "reverse proxied body");
 
-if (have_module('cgi')) {
+if (have_cgi) {
     $r = GET("/reverse/modules/cgi/env.pl");
     ok t_cmp($r->code, 200, "reverse proxy to env.pl");
     ok t_cmp($r->content, qr/^APACHE_TEST_HOSTNAME = /, "reverse proxied env.pl response");
@@ -24,11 +24,15 @@
     ok t_cmp($r->code, 200, "reverse proxy with query string");
     ok t_cmp($r->content, qr/QUERY_STRING = reverse-proxy\n/s, "reverse proxied query
string OK");
 
-    $r = GET("/reverse/modules/cgi/nph-102.pl");
-    ok t_cmp($r->code, 200, "reverse proxy to nph-102");
-    ok t_cmp($r->content, "this is nph-stdout", "reverse proxy 102 response");
+    if (have_min_apache_version('2.1.0')) {
+        $r = GET("/reverse/modules/cgi/nph-102.pl");
+        ok t_cmp($r->code, 200, "reverse proxy to nph-102");
+        ok t_cmp($r->content, "this is nph-stdout", "reverse proxy 102 response");
+    } else {
+        skip "skipping tests with httpd <2.1.0" foreach (1..2);
+    }
 } else {
-    skip "skipping tests without mod_cgi" foreach (1..6);
+    skip "skipping tests without CGI module" foreach (1..6);
 }
 
 if (have_module('alias')) {

Mime
View raw message