diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/webrick/ssl.rb | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -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> * file.c, win32/file.c: Removed obsoleted safe level checks. diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb index 8eb3a442da..b072546948 100644 --- a/lib/webrick/ssl.rb +++ b/lib/webrick/ssl.rb @@ -52,6 +52,8 @@ module WEBrick # Maximum session lifetime # :SSLOptions :: # Various SSL options + # :SSLCiphers :: + # Ciphers to be used # :SSLStartImmediately :: # Immediately start SSL upon connection? Defaults to true # :SSLCertName :: @@ -76,6 +78,7 @@ module WEBrick :SSLVerifyCallback => nil, # custom verification :SSLTimeout => nil, :SSLOptions => nil, + :SSLCiphers => nil, :SSLStartImmediately => true, # Must specify if you use auto generated certificate. :SSLCertName => nil, @@ -191,6 +194,7 @@ module WEBrick ctx.verify_callback = config[:SSLVerifyCallback] ctx.timeout = config[:SSLTimeout] ctx.options = config[:SSLOptions] + ctx.ciphers = config[:SSLCiphers] ctx end end |