summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-01 17:30:40 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-01 17:30:40 +0000
commita9da115662c04f3e440df1b841aea079c926578a (patch)
treeb049b35996dd49218c27ba3874fddcf1936b5ca2
parente2ae64a7dc61e507a66e02e16f1054375bd5c839 (diff)
* lib/webrick/ssl.rb: new option :SSLExtraChainCert.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/webrick/ssl.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb99e4859a..015d0d94c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 2 02:28:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/ssl.rb: new option :SSLExtraChainCert.
+
Sun Nov 2 01:02:04 2003 Akinori MUSHA <knu@iDaemons.org>
* string.c (rb_str_hash): Update the HASH_PERL alternative hash
@@ -5,7 +9,7 @@ Sun Nov 2 01:02:04 2003 Akinori MUSHA <knu@iDaemons.org>
* st.c (strhash): Ditto.
-Sat Nov 1 18:21:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat Nov 1 18:21:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
SSLSocket#peer_cert_chain.
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index 402fd5d993..4562ba4948 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -18,6 +18,7 @@ module WEBrick
:SSLCertificate => nil,
:SSLPrivateKey => nil,
:SSLClientCA => nil,
+ :SSLExtraChainCert => nil,
:SSLCACertificateFile => nil,
:SSLCACertificatePath => nil,
:SSLCertificateStore => nil,
@@ -110,6 +111,7 @@ module WEBrick
ctx.key = config[:SSLPrivateKey]
ctx.cert = config[:SSLCertificate]
ctx.client_ca = config[:SSLClientCA]
+ ctx.extra_chain_cert = config[:SSLExtraChainCert]
ctx.ca_file = config[:SSLCACertificateFile]
ctx.ca_path = config[:SSLCACertificatePath]
ctx.cert_store = config[:SSLCertificateStore]