svn commit: r902010 - in /httpd/test/framework/trunk: c-modules/authany/mod_authany.c t/conf/include-ssi-exec.conf.in t/security/CVE-2009-1195.t

[sc...@apache.org]

Author: sctemme
Date: Fri Jan 22 06:57:33 2010
New Revision: 902010

URL: http://svn.apache.org/viewvc?rev=902010&view=rev
Log:
Incomplete edits needed to help the testsuite run against Apache 1.3 which does not know about IfVersion

Modified:
    httpd/test/framework/trunk/c-modules/authany/mod_authany.c
    httpd/test/framework/trunk/t/conf/include-ssi-exec.conf.in
    httpd/test/framework/trunk/t/security/CVE-2009-1195.t

Modified: httpd/test/framework/trunk/c-modules/authany/mod_authany.c
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/c-modules/authany/mod_authany.c?rev=902010&r1=902009&r2=902010&view=diff
==============================================================================
--- httpd/test/framework/trunk/c-modules/authany/mod_authany.c (original)
+++ httpd/test/framework/trunk/c-modules/authany/mod_authany.c Fri Jan 22 06:57:33 2010
@@ -5,9 +5,11 @@
    require user any-user
    AuthType Basic
    AuthName authany
-   <IfVersion >= 2.3>
-      AuthBasicProvider any
-   </IfVersion>
+   <IfDefine !APACHE1>
+      <IfVersion >= 2.3>
+         AuthBasicProvider any
+      </IfVersion>
+   </IfDefine>
 </Location>
 
 #endif

Modified: httpd/test/framework/trunk/t/conf/include-ssi-exec.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/include-ssi-exec.conf.in?rev=902010&r1=902009&r2=902010&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/include-ssi-exec.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/include-ssi-exec.conf.in Fri Jan 22 06:57:33 2010
@@ -1,6 +1,7 @@
 # Test cases for Includes options inheritance, see test case
 # t/security/CVE-2009-1195.t
 
+<IfDefine !APACHE1>
 <IfModule mod_include.c>
 
 <Directory "@SERVERROOT@/htdocs/modules/include/ssi-exec/1">
@@ -493,3 +494,4 @@
 </Directory>
 
 </IfModule>
+</IfDefine>

Modified: httpd/test/framework/trunk/t/security/CVE-2009-1195.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/security/CVE-2009-1195.t?rev=902010&r1=902009&r2=902010&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/security/CVE-2009-1195.t (original)
+++ httpd/test/framework/trunk/t/security/CVE-2009-1195.t Fri Jan 22 06:57:33 2010
@@ -7,7 +7,7 @@
 
 Apache::TestRequest::module('mod_include'); #use this module's port
 
-plan tests => 221;
+plan tests => 221, need_min_apache_version('2.2');
 
 my $r;
 my $body;