usa	2014-02-19 01:51:06 +0900 (Wed, 19 Feb 2014)

  New Revision: 45040

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

  Log:
    merge revision(s) 34605: [Backport #9351]
    
    Set encoding as ASCII-8BIT. [Bug #6027]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/test/ruby/memory_status.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 45039)
+++ ruby_1_9_3/version.h	(revision 45040)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 536
+#define RUBY_PATCHLEVEL 537
 
-#define RUBY_RELEASE_DATE "2014-02-18"
+#define RUBY_RELEASE_DATE "2014-02-19"
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/memory_status.rb
===================================================================
--- ruby_1_9_3/test/ruby/memory_status.rb	(revision 45039)
+++ ruby_1_9_3/test/ruby/memory_status.rb	(revision 45040)
@@ -7,7 +7,7 @@ module Memory https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/ruby/memory_status.rb#L7
     PROC_FILE = procfile
     VM_PAT = /^Vm(\w+):\s+(\d+)/
     def self.read_status
-      IO.foreach(PROC_FILE) do |l|
+      IO.foreach(PROC_FILE, encoding: Encoding::ASCII_8BIT) do |l|
         yield($1.downcase.intern, $2.to_i * 1024) if VM_PAT =~ l
       end
     end

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r34605


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