5 files changed, 13 insertions, 19 deletions
diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
index bccb091861..fc4cd2275a 100644
--- a/lib/webrick/httpservlet/abstract.rb
+++ b/lib/webrick/httpservlet/abstract.rb
@@ -9,9 +9,9 @@
 #
 # $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $
 
-require_relative '../htmlutils'
-require_relative '../httputils'
-require_relative '../httpstatus'
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
 
 module WEBrick
   module HTTPServlet
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index 4457770b7a..b1fb471c54 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -11,8 +11,8 @@
 
 require 'rbconfig'
 require 'tempfile'
-require_relative '../config'
-require_relative 'abstract'
+require 'webrick/config'
+require 'webrick/httpservlet/abstract'
 
 module WEBrick
   module HTTPServlet
@@ -28,7 +28,6 @@ module WEBrick
     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+
@@ -37,12 +36,7 @@ module WEBrick
         super(server, name)
         @script_filename = name
         @tempdir = server[:TempDir]
-        interpreter = server[:CGIInterpreter]
-        if interpreter.is_a?(Array)
-          @cgicmd = CGIRunnerArray + interpreter
-        else
-          @cgicmd = "#{CGIRunner} #{interpreter}"
-        end
+        @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
       end
 
       # :stopdoc:
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index cd09e5f216..aa02ce8a1d 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
 
-require_relative 'abstract'
+require 'webrick/httpservlet/abstract.rb'
 
 require 'erb'
 
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 601882ef4c..0072e81ac6 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -11,9 +11,9 @@
 
 require 'time'
 
-require_relative '../htmlutils'
-require_relative '../httputils'
-require_relative '../httpstatus'
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
 
 module WEBrick
   module HTTPServlet
@@ -55,7 +55,7 @@ module WEBrick
         else
           mtype = HTTPUtils::mime_type(@local_path, @config[:MimeTypes])
           res['content-type'] = mtype
-          res['content-length'] = st.size.to_s
+          res['content-length'] = st.size
           res['last-modified'] = mtime.httpdate
           res.body = File.open(@local_path, "rb")
         end
@@ -144,7 +144,7 @@ module WEBrick
             raise HTTPStatus::RequestRangeNotSatisfiable if first < 0
             res['content-type'] = mtype
             res['content-range'] = "bytes #{first}-#{last}/#{filesize}"
-            res['content-length'] = (last - first + 1).to_s
+            res['content-length'] = last - first + 1
             res.body = io.dup
           else
             raise HTTPStatus::BadRequest
diff --git a/lib/webrick/httpservlet/prochandler.rb b/lib/webrick/httpservlet/prochandler.rb
index 599ffc4340..c1f454e2f6 100644
--- a/lib/webrick/httpservlet/prochandler.rb
+++ b/lib/webrick/httpservlet/prochandler.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
 
-require_relative 'abstract'
+require 'webrick/httpservlet/abstract.rb'
 
 module WEBrick
   module HTTPServlet