diff --git a/ChangeLog b/ChangeLog
index 5de892c1bc..f21ee6a184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 12 23:08:11 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb (read_from_cmdline): this code is better.
+	  [ruby-core:25991]
+
 Thu Nov 12 22:55:42 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
 	* lib/net/telnet.rb: don't use simple delegate.
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 240d3bb714..3930663331 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -555,11 +555,7 @@ class CGI
             %|(offline mode: enter name=value pairs on standard input)\n|
           )
         end
-        array = nil
-        begin
-            readlines
-        rescue
-        end
+        array = readlines rescue nil
         if not array.nil?
             array.join(' ').gsub(/\n/n, '')
         else