diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-07 20:16:15 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-07 20:16:15 +0000 |
| commit | b1e29f011dd4c275f7a06c073ff7f100f42732d8 () | |
| tree | b85bda4e7575df8d4f4fa492544fccea3f290ce5 | |
| parent | 170c40a5cf999594294c5212fd67e9b008941225 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/webrick/httpproxy.rb | 4 | ||||
| -rw-r--r-- | lib/webrick/httpserver.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/cgihandler.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/erbhandler.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/filehandler.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httputils.rb | 1 |
7 files changed, 19 insertions, 6 deletions
@@ -1,3 +1,15 @@ Sun Aug 7 23:52:39 2005 NAKAMURA, Hiroshi <[email protected]> * test/ruby/test_super.rb: added optional arg tests. [ruby-dev:26743] @@ -24,8 +24,8 @@ module WEBrick end class HTTPProxyServer < HTTPServer - def initialize(config) - super c = @config @via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}" end @@ -21,7 +21,7 @@ module WEBrick class HTTPServer < ::WEBrick::GenericServer def initialize(config={}, default=Config::HTTP) - super @http_version = HTTPVersion::convert(@config[:HTTPVersion]) @mount_tab = MountTable.new @@ -23,7 +23,7 @@ module WEBrick CGIRunner = "\"#{Ruby}\" \"#{Config::LIBDIR}/httpservlet/cgi_runner.rb\"" def initialize(server, name) - super @script_filename = name @tempdir = server[:TempDir] @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}" @@ -17,7 +17,7 @@ module WEBrick class ERBHandler < AbstractServlet def initialize(server, name) - super @script_filename = name end @@ -20,7 +20,7 @@ module WEBrick class DefaultFileHandler < AbstractServlet def initialize(server, local_path) - super @local_path = local_path end @@ -90,6 +90,7 @@ module WEBrick "tiff" => "image/tiff", "txt" => "text/plain", "xbm" => "image/x-xbitmap", "xls" => "application/vnd.ms-excel", "xml" => "text/xml", "xpm" => "image/x-xpixmap", |