diff --git a/ChangeLog b/ChangeLog index 98be3e1d..5904159a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-03 Tatsuhiro Tsujikawa + + Reverted the previous change in src/MultiUrlRequestInfo.cc. + Change log level of warning message about CA certificates to info. + * src/MultiUrlRequestInfo.cc + 2010-10-03 Tatsuhiro Tsujikawa Removed warning message when CA certificates are not imported. diff --git a/src/MultiUrlRequestInfo.cc b/src/MultiUrlRequestInfo.cc index 0cf919f4..89dcf0d6 100644 --- a/src/MultiUrlRequestInfo.cc +++ b/src/MultiUrlRequestInfo.cc @@ -159,7 +159,11 @@ downloadresultcode::RESULT MultiUrlRequestInfo::execute() option_->get(PREF_PRIVATE_KEY)); } if(!option_->blank(PREF_CA_CERTIFICATE)) { - tlsContext->addTrustedCACertFile(option_->get(PREF_CA_CERTIFICATE)); + if(!tlsContext->addTrustedCACertFile(option_->get(PREF_CA_CERTIFICATE))) { + logger_->info(MSG_WARN_NO_CA_CERT); + } + } else if(option_->getAsBool(PREF_CHECK_CERTIFICATE)) { + logger_->info(MSG_WARN_NO_CA_CERT); } if(option_->getAsBool(PREF_CHECK_CERTIFICATE)) { tlsContext->enablePeerVerification();