1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
shyouhei 2009-12-14 02:40:07 +00:00
parent c9e7007134
commit 25c243bf2f
3 changed files with 12 additions and 2 deletions

View file

@ -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 file

@ -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)

View file

@ -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