1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/webrick/ssl.rb: Support to add SSLCiphers option.

Browse Source 
[fix GH-1321] Patch by @rhadoo

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2016-04-22 01:51:18 +00:00
parent 48d22f8360
commit 8a77a41fc3
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Apr 22 10:51:13 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/webrick/ssl.rb: Support to add SSLCiphers option.
[fix GH-1321] Patch by @rhadoo
Fri Apr 22 10:43:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> Fri Apr 22 10:43:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* file.c, win32/file.c: Removed obsoleted safe level checks. * file.c, win32/file.c: Removed obsoleted safe level checks.

4
lib/webrick/ssl.rb
View File

@ -52,6 +52,8 @@ module WEBrick
# Maximum session lifetime # Maximum session lifetime
# :SSLOptions :: # :SSLOptions ::
# Various SSL options # Various SSL options
# :SSLCiphers ::
# Ciphers to be used
# :SSLStartImmediately :: # :SSLStartImmediately ::
# Immediately start SSL upon connection? Defaults to true # Immediately start SSL upon connection? Defaults to true
# :SSLCertName :: # :SSLCertName ::
@ -76,6 +78,7 @@ module WEBrick
:SSLVerifyCallback => nil, # custom verification :SSLVerifyCallback => nil, # custom verification
:SSLTimeout => nil, :SSLTimeout => nil,
:SSLOptions => nil, :SSLOptions => nil,
:SSLCiphers => nil,
:SSLStartImmediately => true, :SSLStartImmediately => true,
# Must specify if you use auto generated certificate. # Must specify if you use auto generated certificate.
:SSLCertName => nil, :SSLCertName => nil,
@ -191,6 +194,7 @@ module WEBrick
ctx.verify_callback = config[:SSLVerifyCallback] ctx.verify_callback = config[:SSLVerifyCallback]
ctx.timeout = config[:SSLTimeout] ctx.timeout = config[:SSLTimeout]
ctx.options = config[:SSLOptions] ctx.options = config[:SSLOptions]
ctx.ciphers = config[:SSLCiphers]
ctx ctx
end end
end end