shyouhei	2009-12-14 11:40:07 +0900 (Mon, 14 Dec 2009)

  New Revision: 26086

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

  Log:
    merge revision(s) 25735:
    * lib/cgi.rb: fix command-line option of
      non-interactive terminal. [ruby-core:23016]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/cgi.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26085)
+++ ruby_1_8_7/ChangeLog	(revision 26086)
@@ -1,3 +1,8 @@
+Mon Dec 14 11:31:58 2009  Takeyuki FUJIOKA  <xibbar@r...>
+
+	* 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@m...>
 
 	* eval.c (method_inspect, method_name, mnew): Bug fix when
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26085)
+++ ruby_1_8_7/version.h	(revision 26086)
@@ -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
Index: ruby_1_8_7/lib/cgi.rb
===================================================================
--- ruby_1_8_7/lib/cgi.rb	(revision 26085)
+++ ruby_1_8_7/lib/cgi.rb	(revision 26086)
@@ -1089,7 +1089,12 @@
             %|(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)

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