svn commit: r1838612 - in /httpd/test/framework/trunk/t: conf/ssl/ssl.conf.in ssl/ocsp.t

[jo...@apache.org]

Author: jorton
Date: Wed Aug 22 07:41:29 2018
New Revision: 1838612

URL: http://svn.apache.org/viewvc?rev=1838612&view=rev
Log:
Only run OCSP test for >= 2.4.26.

Modified:
    httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
    httpd/test/framework/trunk/t/ssl/ocsp.t

Modified: httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in?rev=1838612&r1=1838611&r2=1838612&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in Wed Aug 22 07:41:29 2018
@@ -246,6 +246,8 @@
     <VirtualHost ssl_ocsp>
        SSLEngine on
 
+     # SSLOCSPResponderCertificateFile is available from 2.4.26
+     <IfVersion >= 2.4.26>
        SSLVerifyClient on
 
        SSLOCSPEnable on
@@ -254,6 +256,7 @@
 
        # Ignore CRL check results
        SSLCARevocationCheck none
+     </IfVersion>
     </VirtualHost>
 
     # For t/ssl/pr43738.t:

Modified: httpd/test/framework/trunk/t/ssl/ocsp.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ssl/ocsp.t?rev=1838612&r1=1838611&r2=1838612&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/ssl/ocsp.t (original)
+++ httpd/test/framework/trunk/t/ssl/ocsp.t Wed Aug 22 07:41:29 2018
@@ -20,8 +20,9 @@ Apache::TestRequest::module('ssl_ocsp');
 # Requires OpenSSL 1.1, can't find a simple way to test for OCSP
 # support in earlier versions without messing around with stderr
 my $openssl = Apache::TestSSLCA::openssl();
-if (`$openssl list -commands 2>/dev/null` !~ /ocsp/) {
-    print "1..0 # skip: No OpenSSL OCSP support";
+if (!have_min_apache_version('2.4.26')
+    or `$openssl list -commands 2>/dev/null` !~ /ocsp/) {
+    print "1..0 # skip: No OpenSSL or mod_ssl OCSP support";
     exit 0;
 }