瀏覽代碼

2010-10-03 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Reverted the previous change in src/MultiUrlRequestInfo.cc.
	Change log level of warning message about CA certificates to info.
	* src/MultiUrlRequestInfo.cc
Tatsuhiro Tsujikawa 15 年之前
父節點
當前提交
329de2a9b5
共有 2 個文件被更改,包括 11 次插入1 次删除
  1. 6 0
      ChangeLog
  2. 5 1
      src/MultiUrlRequestInfo.cc

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2010-10-03  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	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  <t-tujikawa@users.sourceforge.net>
 
 	Removed warning message when CA certificates are not imported.

+ 5 - 1
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();