Skip to content

Commit ee8344e

Browse files
committed
merge revision(s) 34605: [Backport ruby#9351]
Set encoding as ASCII-8BIT. [Bug ruby#6027] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 3fce289 commit ee8344e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

test/ruby/memory_status.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module Memory
77
PROC_FILE = procfile
88
VM_PAT = /^Vm(\w+):\s+(\d+)/
99
def self.read_status
10-
IO.foreach(PROC_FILE) do |l|
10+
IO.foreach(PROC_FILE, encoding: Encoding::ASCII_8BIT) do |l|
1111
yield($1.downcase.intern, $2.to_i * 1024) if VM_PAT =~ l
1212
end
1313
end

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "1.9.3"
2-
#define RUBY_PATCHLEVEL 536
2+
#define RUBY_PATCHLEVEL 537
33

4-
#define RUBY_RELEASE_DATE "2014-02-18"
4+
#define RUBY_RELEASE_DATE "2014-02-19"
55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 2
7-
#define RUBY_RELEASE_DAY 18
7+
#define RUBY_RELEASE_DAY 19
88

99
#include "ruby/version.h"
1010

0 commit comments

Comments
 (0)