From 25c243bf2f5e01e91a1e3ccf17fdeb1897623488 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 14 Dec 2009 02:40:07 +0000 Subject: merge revision(s) 25735: * lib/cgi.rb: fix command-line option of non-interactive terminal. [ruby-core:23016] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/cgi.rb | 7 ++++++- version.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6387434ff..4390ef6d76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 14 11:31:58 2009 Takeyuki FUJIOKA + + * lib/cgi.rb: fix command-line option of + non-interactive terminal. [ruby-core:23016] + Mon Dec 14 03:36:20 2009 Marc-Andre Lafortune * eval.c (method_inspect, method_name, mnew): Bug fix when diff --git a/lib/cgi.rb b/lib/cgi.rb index 6d299798e6..7ee0edc9ac 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1089,7 +1089,12 @@ class CGI %|(offline mode: enter name=value pairs on standard input)\n| ) end - readlines.join(' ').gsub(/\n/n, '') + array = readlines rescue nil + if not array.nil? + array.join(' ').gsub(/\n/n, '') + else + "" + end end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26') words = Shellwords.shellwords(string) diff --git a/version.h b/version.h index 7ccef14146..a9b449e8fd 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-12-14" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091214 -#define RUBY_PATCHLEVEL 230 +#define RUBY_PATCHLEVEL 231 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3