Permalink
Browse files

merge revision(s) 25735:

	* lib/cgi.rb: fix command-line option of
	  non-interactive terminal. [ruby-core:23016]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@26086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent be734cf commit 909d0466dcc6376c9862612260377d6619b1bfdf @shyouhei shyouhei committed Dec 14, 2009
Showing with 12 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +6 −1 lib/cgi.rb
  3. +1 −1 version.h
View
@@ -1,3 +1,8 @@
+Mon Dec 14 11:31:58 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+
+ * lib/cgi.rb: fix command-line option of
+ non-interactive terminal. [ruby-core:23016]
+
Mon Dec 14 03:36:20 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* eval.c (method_inspect, method_name, mnew): Bug fix when
View
@@ -1089,7 +1089,12 @@ def read_from_cmdline
%|(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)
View
@@ -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

0 comments on commit 909d046

Please sign in to comment.