* lib/webrick/httpproxy.rb (HTTPProxyServer#intialize),

  lib/webrick/httpserver.rb (HTTPServer#intialize),
  lib/webrick/httpservlet/cgihandler.rb (CGIHandler#initialize),
  lib/webrick/httpservlet/erbhandler.rb (ERBHandler#initialize),
  lib/webrick/httpservlet/filehandler.rb(DefaultFileHandler#initialize):
  super (called with no arguments) takes default value of optional
  arguments. [ruby-dev:26743]

* lib/webrick/httputils.rb: add a media-type "text/html" for .xhtml.


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

6 files changed, 7 insertions, 6 deletions

diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index 14e3499775..8864620e12 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -24,8 +24,8 @@ module WEBrick
   end
 
   class HTTPProxyServer < HTTPServer
-    def initialize(config)
-      super
+    def initialize(config={}, default=Config::HTTP)
+      super(config, default)
       c = @config
       @via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}"
     end
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index bce94746c2..9441d84661 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -21,7 +21,7 @@ module WEBrick
 
   class HTTPServer < ::WEBrick::GenericServer
     def initialize(config={}, default=Config::HTTP)
-      super
+      super(config, default)
       @http_version = HTTPVersion::convert(@config[:HTTPVersion])
 
       @mount_tab = MountTable.new
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index 7dd330ba7b..9a300cf72b 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -23,7 +23,7 @@ module WEBrick
       CGIRunner = "\"#{Ruby}\" \"#{Config::LIBDIR}/httpservlet/cgi_runner.rb\""
 
       def initialize(server, name)
-        super
+        super(server, name)
         @script_filename = name
         @tempdir = server[:TempDir]
         @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index b9d5e65b65..49792193ba 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -17,7 +17,7 @@ module WEBrick
 
     class ERBHandler < AbstractServlet
       def initialize(server, name)
-        super
+        super(server, name)
         @script_filename = name
       end
 
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index ba9417f3e8..918393dbd4 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -20,7 +20,7 @@ module WEBrick
 
     class DefaultFileHandler < AbstractServlet
       def initialize(server, local_path)
-        super
+        super(server, local_path)
         @local_path = local_path
       end
 
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index 2a65552f20..e660f04405 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -90,6 +90,7 @@ module WEBrick
       "tiff"  => "image/tiff",
       "txt"   => "text/plain",
       "xbm"   => "image/x-xbitmap",
+      "xhtml" => "text/html",
       "xls"   => "application/vnd.ms-excel",
       "xml"   => "text/xml",
       "xpm"   => "image/x-xpixmap",