You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by st...@apache.org on 2019/06/26 17:23:00 UTC
svn commit: r1862167 - /perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Author: stevehay
Date: Wed Jun 26 17:22:59 2019
New Revision: 1862167
URL: http://svn.apache.org/viewvc?rev=1862167&view=rev
Log:
Allow for Apache::TestSSLCA failing to load
As of r1845766 Apache::TestSSLCA has a FATAL error when loading if openssl cannot be found on
the system, which caused Apache::TestConfig->new() to fail unless sslproto was specified.
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=1862167&r1=1862166&r2=1862167&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Wed Jun 26 17:22:59 2019
@@ -300,9 +300,7 @@ sub new {
$vars->{sslca} ||= catfile $vars->{t_conf}, 'ssl', 'ca';
$vars->{sslcaorg} ||= 'asf';
- if (!defined($vars->{sslproto})) {
- require Apache::TestSSLCA;
-
+ if (!defined($vars->{sslproto}) and eval { require Apache::TestSSLCA; 1; }) {
$vars->{sslproto} = Apache::TestSSLCA::sslproto();
}
else {