diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-21 03:30:22 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-21 03:30:22 +0000 |
| commit | 8cfe0591bd139d14ddd9408dfc15e5628c4b9247 (patch) | |
| tree | be781c5c9eeda91ae0c4f4326e3ebbc0889688f7 | |
| parent | cd4fd029580e5428fc54e0dc84be4d2ee96f9562 (diff) | |
| download | ruby-8cfe0591bd139d14ddd9408dfc15e5628c4b9247.tar.gz ruby-8cfe0591bd139d14ddd9408dfc15e5628c4b9247.tar.xz ruby-8cfe0591bd139d14ddd9408dfc15e5628c4b9247.zip | |
* lib/cgi.rb: CGI#header: do not set Apache.request.status for
Location: if Apache.request.status is already set.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -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 c86ac3230..84d545f46 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 |