From 3f06be1b9d5904514811bdbf53742d7ec528bf8f Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Thu, 9 Dec 2004 07:22:45 +0000 Subject: * lib/webrick/cgi.rb (WEBrick::CGI#setup_header): avoid SecurityError. [ruby-dev:24970] * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait for reading request till data arrive. [ruby-talk:121068] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/cgi.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'lib/webrick/cgi.rb') diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index 5c38e42fc4..1282bdcd93 100644 --- a/lib/webrick/cgi.rb +++ b/lib/webrick/cgi.rb @@ -158,20 +158,19 @@ module WEBrick end def setup_header - add_header("CONTENT_TYPE", "Content-Type") - add_header("CONTENT_LENGTH", "Content-length") - @env.each_key{|name| - if /^HTTP_(.*)/ =~ name - add_header(name, $1.gsub(/_/, "-")) + @env.each{|key, value| + case key + when "CONTENT_TYPE", "CONTENT_LENGTH" + add_header(key.gsub(/_/, "-"), value) + when /^HTTP_(.*)/ + add_header($1.gsub(/_/, "-"), value) end } end - def add_header(envname, hdrname) - if value = @env[envname] - unless value.empty? - @header_part << hdrname << ": " << value << CRLF - end + def add_header(hdrname, value) + unless value.empty? + @header_part << hdrname << ": " << value << CRLF end end -- cgit v1.2.3