diff --git a/ChangeLog b/ChangeLog
index 3f485390a0..b725462f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 21 12:22:52 2001  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/cgi.rb: CGI#header: do not set Apache.request.status for
+	Location: if Apache.request.status is already set.
+
 Tue Nov 20 01:07:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (str_extend): should not terminate string interpolation
diff --git a/lib/cgi.rb b/lib/cgi.rb
index c86ac32306..84d545f464 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -505,7 +505,9 @@ status:
         when /^content-encoding$/ni
           Apache::request.content_encoding = value
         when /^location$/ni
-          Apache::request.status = 302
+	  if Apache::request.status == 200
+	    Apache::request.status = 302
+	  end
           Apache::request.headers_out[name] = value
         else
           Apache::request.headers_out[name] = value