From ca94f612b4c01b90a8ae89ff40793b847370a7c2 Mon Sep 17 00:00:00 2001
From: wakou <wakou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Sep 2000 21:16:09 +0000
Subject: [PATCH] wakou

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         |  4 ++++
 lib/cgi.rb        | 13 +++++++++++--
 lib/net/telnet.rb |  5 ++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e1c22dcc2..dca259b0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 13 06:09:26 2000  Wakou Aoyama <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: bug fix: CGI::header(): output status header.
+
 Tue Sep 12 22:34:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* stable version 1.6.0 released.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 1b5dc7d5b0..6bd8a7f038 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -4,7 +4,7 @@
 
 cgi.rb - cgi support library
 
-Version 2.0.0
+Version 2.0.1
 
 Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
 
@@ -436,8 +436,12 @@ status:
         options["connection"] = "close"
       end
 
+      options.delete("status")
+    end
+
+    if options.has_key?("status")
+      buf.concat("Status: " + options.delete("status") + EOL)
     end
-    options.delete("status")
 
     if options.has_key?("server")
       buf.concat("Server: " + options.delete("server") + EOL)
@@ -1920,6 +1924,11 @@ end
 
 == HISTORY
 
+* Wed Sep 13 06:09:26 JST 2000 - wakou
+  * version 2.0.1
+  * bug fix: CGI::header(): output status header.
+    thanks to Yasuhiro Fukuma <yasuf@bsdclub.org>
+
 * Tue Sep 12 06:56:51 JST 2000 - wakou
   * version 2.0.0
   * require ruby1.5.4 or later. (ruby1.4 doesn't have block_given? method.)
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 44bb223ddf..8ff1884e7a 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -599,6 +599,9 @@ end
 
 == HISTORY
 
+* 2000/09/12 05:37:35 - matz
+  * change: iterator? --> block_given?
+
 * Tue Sep 12 06:52:48 JST 2000 - wakou
   * version 1.6.0
   * correct: document.
@@ -706,7 +709,7 @@ end
 
 * 1999/04/11 - wakou
   * version 0.163
-  * STDOUT.write(message) --> yield(message) if block_given?
+  * STDOUT.write(message) --> yield(message) if iterator?
 
 * 1999/03/17 - wakou
   * version 0.162