shyouhei	2010-11-22 16:21:52 +0900 (Mon, 22 Nov 2010)

  New Revision: 29858

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29858

  Log:
    Thu, 29 Jul 2010 13:46:40 +0000  nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
     merge revision(s) 28784:
     
     	* lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert): wrongly
     	  created dummy SSL certificate with version == 3 (no such version) and
     	  serial == 0 (must be >0).
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/webrick/ssl.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29857)
+++ ruby_1_8_7/ChangeLog	(revision 29858)
@@ -1,3 +1,9 @@
+Thu Jul 29 22:43:57 2010  NAKAMURA, Hiroshi  <nahi@r...>
+
+	* lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert): wrongly
+	  created dummy SSL certificate with version == 3 (no such version) and
+	  serial == 0 (must be >0).
+
 Sat Jul 24 15:44:29 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29857)
+++ ruby_1_8_7/version.h	(revision 29858)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 307
+#define RUBY_PATCHLEVEL 308
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/webrick/ssl.rb
===================================================================
--- ruby_1_8_7/lib/webrick/ssl.rb	(revision 29857)
+++ ruby_1_8_7/lib/webrick/ssl.rb	(revision 29858)
@@ -50,8 +50,8 @@
         end
       }
       cert = OpenSSL::X509::Certificate.new
-      cert.version = 3
-      cert.serial = 0
+      cert.version = 2
+      cert.serial = 1
       name = OpenSSL::X509::Name.new(cn)
       cert.subject = name
       cert.issuer = name

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