mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/webrick/config.rb (WEBrick::Config::HTTP): rename :RequestHander
to :RequestCallback and add new option :ServerAlias. * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use :RequestCallback and warn if :RequestHandler is in server's option. * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print error message for WEBrick::HTTPSataus::Error. * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server): lookup for hostname from :ServerAlias if the req.host is not match to :ServerName. * lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET): use $?.exitstatus and refine log message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4774e8fda5
commit
9b11fc8032
4 changed files with 35 additions and 11 deletions
|
@ -55,7 +55,7 @@ module WEBrick
|
|||
end
|
||||
ensure
|
||||
cgi_in.close
|
||||
status = $? >> 8
|
||||
status = $?.exitstatus
|
||||
sleep 0.1 if /mswin/ =~ RUBY_PLATFORM
|
||||
data = cgi_out.read
|
||||
cgi_out.close(true)
|
||||
|
@ -74,7 +74,7 @@ module WEBrick
|
|||
data = "" unless data
|
||||
raw_header, body = data.split(/^[\xd\xa]+/on, 2)
|
||||
raise HTTPStatus::InternalServerError,
|
||||
"The server encontered a script error." if body.nil?
|
||||
"Premature end of script headers: #{@script_filename}" if body.nil?
|
||||
|
||||
begin
|
||||
header = HTTPUtils::parse_header(raw_header)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue