yugui	2009-08-09 00:30:55 +0900 (Sun, 09 Aug 2009)

  New Revision: 24455

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

  Log:
    merges r24341 from trunk into ruby_1_9_1.
    --
    * lib/securerandom.rb (SecureRandom.random_bytes): return string should
      be ASCII-8BIT.  [ruby-core:24640]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/securerandom.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24454)
+++ ruby_1_9_1/ChangeLog	(revision 24455)
@@ -1,3 +1,8 @@
+Fri Jul 31 18:01:34 2009  NAKAMURA Usaku  <usa@r...>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): return string should
+	  be ASCII-8BIT.  [ruby-core:24640]
+
 Fri Jul 31 10:54:08 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (literal_concat_gen): reduced unnecessary node at string
Index: ruby_1_9_1/lib/securerandom.rb
===================================================================
--- ruby_1_9_1/lib/securerandom.rb	(revision 24454)
+++ ruby_1_9_1/lib/securerandom.rb	(revision 24455)
@@ -99,7 +99,7 @@
       end
     end
     if @has_win32
-      bytes = " " * n
+      bytes = " ".force_encoding("ASCII-8BIT") * n
       if @crypt_gen_random.call(@hProv, bytes.size, bytes) == 0
         raise SystemCallError, "CryptGenRandom failed: #{lastWin32ErrorMessage}"
       end
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24454)
+++ ruby_1_9_1/version.h	(revision 24455)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 259
+#define RUBY_PATCHLEVEL 260
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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