* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger

  and WEBrick::CGI#config. (backported from HEAD)

* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
  not use String#split("/"). (backported from HEAD)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
+	  and WEBrick::CGI#config. (backported from HEAD)
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
+	  not use String#split("/"). (backported from HEAD)
+
 Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/tempfile.rb (Tempfile#unlink): fixed typo.

lib/webrick/cgi.rb

@@ -16,6 +16,8 @@ module WEBrick
   class CGI
     CGIError = Class.new(StandardError)
 
+    attr_reader :config, :logger
+
     def initialize(*args)
       if defined?(MOD_RUBY)
         unless ENV.has_key?("GATEWAY_INTERFACE")
@@ -26,7 +28,7 @@ def initialize(*args)
         httpv = $1
       end
       @config = WEBrick::Config::HTTP.dup.update(
-        :ServerSoftware => ENV["SERVER_SOFTWARE"],
+        :ServerSoftware => ENV["SERVER_SOFTWARE"] || "null",
         :HTTPVersion    => HTTPVersion.new(httpv || "1.0"),
         :RunOnCGI       => true,   # to detect if it runs on CGI.
         :NPH            => false   # set true to run as NPH script.
@@ -39,14 +41,18 @@ def initialize(*args)
       @options = args
     end
 
+    def [](key)
+      @config[key]
+    end
+
     def start(env=ENV, stdin=$stdin, stdout=$stdout)
       sock = WEBrick::CGI::Socket.new(@config, env, stdin, stdout)
       req = HTTPRequest.new(@config)
       res = HTTPResponse.new(@config)
       unless @config[:NPH] or defined?(MOD_RUBY)
         def res.setup_header
           unless @header["status"]
-            phrase = HTTPStatus::reason_phrase(@status)  
+            phrase = HTTPStatus::reason_phrase(@status)
             @header["status"] = "#{@status} #{phrase}"
           end
           super
@@ -58,12 +64,8 @@ def res.status_line
 
       begin
         req.parse(sock)
-        req.script_name = (env["SCRIPT_NAME"] || "").dup
-        if env["PATH_INFO"].nil? || env["PATH_INFO"].empty?
-          req.path_info = nil
-        else
-          req.path_info = env["PATH_INFO"].dup
-        end
+        req.script_name = (env["SCRIPT_NAME"] || File.expand_path($0)).dup
+        req.path_info = (env["PATH_INFO"] || "").dup
         req.user = env["REMOTE_USER"]
         res.request_method = req.request_method
         res.request_uri = req.request_uri
@@ -145,11 +147,9 @@ def initialize(config, env, stdin, stdout)
       end
 
       def request_line
-        meth = @env["REQUEST_METHOD"]
-        url = @env["SCRIPT_NAME"].dup
-        if path_info = @env["PATH_INFO"]
-          url << path_info
-        end
+        meth = @env["REQUEST_METHOD"] || "GET"
+        url = (@env["SCRIPT_NAME"] || File.expand_path($0)).dup
+        url << @env["PATH_INFO"].to_s
         url = WEBrick::HTTPUtils.escape_path(url)
         if query_string = @env["QUERY_STRING"]
           unless query_string.empty?

lib/webrick/httputils.rb

@@ -384,9 +384,11 @@ def unescape_form(str)
     end
 
     def escape_path(str)
-      str.split("/").collect{|i|
-        _escape(i, UNESCAPED_PCHAR)
-      }.join("/")
+      result = ""
+      str.scan(%r{/([^/]*)}).each{|i|
+        result << "/" << _escape(i[0], UNESCAPED_PCHAR)
+      }
+      return result
     end
 
     def escape8bit(str)

test/webrick/test_httputils.rb

@@ -87,4 +87,10 @@ def test_unescape_form
     assert_equal("//foo/bar baz", unescape_form("/%2Ffoo/bar+baz"))
     assert_equal("/~foo/bar baz", unescape_form("/%7Efoo/bar+baz"))
   end
+
+  def test_escape_path
+    assert_equal("/foo/bar", escape_path("/foo/bar"))
+    assert_equal("/foo/bar/", escape_path("/foo/bar/"))
+    assert_equal("/%25foo/bar/", escape_path("/%foo/bar/"))
+  end
 end

test/webrick/webrick.cgi

@@ -4,7 +4,7 @@ require "webrick/cgi"
 class TestApp < WEBrick::CGI
   def do_GET(req, res)
     res["content-type"] = "text/plain"
-    if p = req.path_info
+    if (p = req.path_info) && p.length > 0
       res.body = p
     elsif (q = req.query).size > 0
       res.body = q.keys.sort.collect{|key|