2 files changed, 2 insertions, 1 deletions
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