From a05e957620e3f7bda092fbd81020e286287cf120 Mon Sep 17 00:00:00 2001 From: knu Date: Wed, 28 May 2008 07:13:04 +0000 Subject: * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET): Set the HTTP status code to 302 if a Location header field is present and the status code is not valid as a client redirection. cf. RFC 3875 6.2.3, 6.2.4. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/webrick/httpservlet/cgihandler.rb | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index a33f2b2eb..9b41d05f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 28 16:12:44 2008 Akinori MUSHA + + * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET): + Set the HTTP status code to 302 if a Location header field is + present and the status code is not valid as a client + redirection. cf. RFC 3875 6.2.3, 6.2.4. + Wed May 28 15:53:52 2008 NAKAMURA Usaku * enc/trans/japanese.c (to_SHIFT_JIS_EF_infos): typo. diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb index 0df3417e4..9211e9535 100644 --- a/lib/webrick/httpservlet/cgihandler.rb +++ b/lib/webrick/httpservlet/cgihandler.rb @@ -87,6 +87,10 @@ module WEBrick res.status = $1.to_i header.delete('status') end + if header.has_key?('location') + # RFC 3875 6.2.3, 6.2.4 + res.status = 302 unless (300...400) === res.status + end if header.has_key?('set-cookie') header['set-cookie'].each{|k| res.cookies << Cookie.parse_set_cookie(k) -- cgit