hsbt	2016-04-22 10:51:18 +0900 (Fri, 22 Apr 2016)

  New Revision: 54669

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54669

  Log:
    * lib/webrick/ssl.rb: Support to add SSLCiphers option.
      [fix GH-1321] Patch by @rhadoo

  Modified files:
    trunk/ChangeLog
    trunk/lib/webrick/ssl.rb
Index: lib/webrick/ssl.rb
===================================================================
--- lib/webrick/ssl.rb	(revision 54668)
+++ lib/webrick/ssl.rb	(revision 54669)
@@ -52,6 +52,8 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/lib/webrick/ssl.rb#L52
     #   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 https://github.com/ruby/ruby/blob/trunk/lib/webrick/ssl.rb#L78
       :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 https://github.com/ruby/ruby/blob/trunk/lib/webrick/ssl.rb#L194
       ctx.verify_callback = config[:SSLVerifyCallback]
       ctx.timeout = config[:SSLTimeout]
       ctx.options = config[:SSLOptions]
+      ctx.ciphers = config[:SSLCiphers]
       ctx
     end
   end
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54668)
+++ ChangeLog	(revision 54669)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Apr 22 10:51:13 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* 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@r...>
 
 	* file.c, win32/file.c: Removed obsoleted safe level checks.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/