diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-08 09:52:34 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-08 09:52:34 +0000 |
| commit | ddae426a47653b29f5e84e84d73437259e58a4c6 (patch) | |
| tree | a9c74524a00d0730e7252a1780284c9001dbd608 /lib/webrick/httprequest.rb | |
| parent | 865ff7fb4f11bbf1f0e139e16470727828f54e63 (diff) | |
| download | ruby-ddae426a47653b29f5e84e84d73437259e58a4c6.tar.gz | |
* lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
instead of config[:Port] or req.request_uri.port.
* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
* lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
* lib/webrick/config.rb: :Listen option never be used.
* lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
option and add warning message.
* lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
* lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httprequest.rb')
| -rw-r--r-- | lib/webrick/httprequest.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index 8b0803878e..2b9f3f2f47 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -184,8 +184,8 @@ module WEBrick meta["REQUEST_METHOD"] = @request_method.dup meta["REQUEST_URI"] = @request_uri.to_s meta["SCRIPT_NAME"] = @script_name.dup - meta["SERVER_NAME"] = @request_uri.host - meta["SERVER_PORT"] = @config[:Port].to_s + meta["SERVER_NAME"] = @host + meta["SERVER_PORT"] = @port meta["SERVER_PROTOCOL"] = "HTTP/" + @config[:HTTPVersion].to_s meta["SERVER_SOFTWARE"] = @config[:ServerSoftware].dup |