xibbar	2009-11-12 23:39:48 +0900 (Thu, 12 Nov 2009)

  New Revision: 25735

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

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

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/cgi.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 25734)
+++ ruby_1_8/ChangeLog	(revision 25735)
@@ -1,3 +1,8 @@
+Thu Nov 12 23:38:47 2009  Takeyuki FUJIOKA  <xibbar@r...>
+
+	* lib/cgi.rb: fix command-line option of
+	  non-interactive terminal. [ruby-core:23016]
+
 Mon Nov  9 11:38:27 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in (clean-ext): get rid of failure.
Index: ruby_1_8/lib/cgi.rb
===================================================================
--- ruby_1_8/lib/cgi.rb	(revision 25734)
+++ ruby_1_8/lib/cgi.rb	(revision 25735)
@@ -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/