httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1002082 - /httpd/test/framework/trunk/t/ssl/require.t
Date Tue, 28 Sep 2010 09:52:35 GMT
Author: rjung
Date: Tue Sep 28 09:52:35 2010
New Revision: 1002082

URL: http://svn.apache.org/viewvc?rev=1002082&view=rev
Log:
Skip certificate extension tests, if version is
lower than 2.1.7 (no OID support in SSLRequire).

Modified:
    httpd/test/framework/trunk/t/ssl/require.t

Modified: httpd/test/framework/trunk/t/ssl/require.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ssl/require.t?rev=1002082&r1=1002081&r2=1002082&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/ssl/require.t (original)
+++ httpd/test/framework/trunk/t/ssl/require.t Tue Sep 28 09:52:35 2010
@@ -10,6 +10,9 @@ use Apache::TestRequest;
 #happen in real-life, so just disable keepalives here.
 Apache::TestRequest::user_agent_keepalive(0);
 
+my $sslrequire_oid_needed_version = '2.1.7';
+my $have_sslrequire_oid = have_min_apache_version($sslrequire_oid_needed_version);
+
 plan tests => 8, need_lwp;
 
 Apache::TestRequest::scheme('https');
@@ -28,11 +31,16 @@ ok GET_RC($url, cert => 'client_ok') != 
 
 ok GET_RC($url, cert => 'client_snakeoil') == 200;
 
-$url = '/require/certext/index.html';
+if ($have_sslrequire_oid) {
 
-ok GET_RC($url, cert => undef) != 200;
+    $url = '/require/certext/index.html';
 
-ok GET_RC($url, cert => 'client_ok') == 200;
+    ok GET_RC($url, cert => undef) != 200;
+
+    ok GET_RC($url, cert => 'client_ok') == 200;
 
-ok GET_RC($url, cert => 'client_snakeoil') != 200;
+    ok GET_RC($url, cert => 'client_snakeoil') != 200;
 
+} else {
+    skip "skipping certificate extension test (httpd < $sslrequire_oid_needed_version)"
foreach (1..3);
+}



Mime
View raw message