Allow WEBrick::HTTPServlet::CGIHandler :CGIInterpreter option to be array

This way you don't need to escape each entry.

Implements Ruby Feature 15170.

Author: jeremyevans

lib/webrick/httpservlet/cgihandler.rb

@@ -28,6 +28,7 @@ module HTTPServlet
     class CGIHandler < AbstractServlet
       Ruby = RbConfig.ruby # :nodoc:
       CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
+      CGIRunnerArray = [Ruby, "#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb".freeze].freeze # :nodoc:
 
       ##
       # Creates a new CGI script servlet for the script at +name+
@@ -36,7 +37,12 @@ def initialize(server, name)
         super(server, name)
         @script_filename = name
         @tempdir = server[:TempDir]
-        @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
+        interpreter = server[:CGIInterpreter]
+        if interpreter.is_a?(Array)
+          @cgicmd = CGIRunnerArray + interpreter
+        else
+          @cgicmd = "#{CGIRunner} #{interpreter}"
+        end
       end
 
       # :stopdoc:

test/webrick/test_filehandler.rb

@@ -289,7 +289,7 @@ def test_script_disclosure
     return if File.executable?(__FILE__) # skip on strange file system
 
     config = {
-      :CGIInterpreter => TestWEBrick::RubyBin,
+      :CGIInterpreter => TestWEBrick::RubyBinArray,
       :DocumentRoot => File.dirname(__FILE__),
       :CGIPathEnv => ENV['PATH'],
       :RequestCallback => Proc.new{|req, res|

test/webrick/utils.rb

@@ -19,6 +19,8 @@ class WEBrick::HTTPServlet::CGIHandler
     Ruby = EnvUtil.rubybin
     remove_const :CGIRunner
     CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
+    remove_const :CGIRunnerArray
+    CGIRunnerArray = [Ruby, "#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb"] # :nodoc:
   end
 
   RubyBin = "\"#{EnvUtil.rubybin}\""
@@ -27,6 +29,12 @@ class WEBrick::HTTPServlet::CGIHandler
   RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/common\""
   RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/#{RUBY_PLATFORM}\""
 
+  RubyBinArray = [EnvUtil.rubybin]
+  RubyBinArray << "--disable-gems"
+  RubyBinArray << "-I" << "#{File.expand_path("../..", File.dirname(__FILE__))}/lib"
+  RubyBinArray << "-I" << "#{File.dirname(EnvUtil.rubybin)}/.ext/common"
+  RubyBinArray << "-I" << "#{File.dirname(EnvUtil.rubybin)}/.ext/#{RUBY_PLATFORM}"
+
   require "test/unit" unless defined?(Test::Unit)
   include Test::Unit::Assertions
   extend Test::Unit::Assertions