From b10696b56840ac6c6eaa5d85f1cf85b6f7cc8a0b Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 Sep 2004 09:14:27 +0000
Subject: * lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER  
 to request.user attribute.

* lib/webrick/httpservlet/filehandler.rb
  (WEBrick::HTTPServlet::FileHandler#initialize): should expand
  the pathname of document root directory.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/webrick/cgi.rb                     | 1 +
 lib/webrick/httpservlet/filehandler.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/webrick')

diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 62c61f519a..5c38e42fc4 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -61,6 +61,7 @@ module WEBrick
         else
           req.path_info = env["PATH_INFO"].dup
         end
+        req.user = env["REMOTE_USER"]
         res.request_method = req.request_method
         res.request_uri = req.request_uri
         res.request_http_version = req.http_version
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 8525d7bb1b..ab118ba5c9 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -139,7 +139,7 @@ module WEBrick
       def initialize(server, root, options={}, default=Config::FileHandler)
         @config = server.config
         @logger = @config[:Logger]
-        @root = root
+        @root = File.expand_path(root)
         if options == true || options == false
           options = { :FancyIndexing => options }
         end
-- 
cgit v1.2.3