diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-13 04:24:16 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-13 04:24:16 +0000 |
| commit | 5fdc9887b0258a76549caa23cafd7b61b392a339 (patch) | |
| tree | 84c5f5e65f09cc99a82796941af833763fb8d593 /lib/webrick/httpservlet/erbhandler.rb | |
| parent | 1d18e23adb34a59264e666eb51cbc2c4362c9f70 (diff) | |
| download | ruby-5fdc9887b0258a76549caa23cafd7b61b392a339.tar.gz ruby-5fdc9887b0258a76549caa23cafd7b61b392a339.tar.xz ruby-5fdc9887b0258a76549caa23cafd7b61b392a339.zip | |
* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
fix regex for range-spec.
* lib/webrick/httpservlet/filehandler.rb
(WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
multipart/byteranges response was broken.
* lib/webrick/httpservlet/erbhandler.rb
(WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
by suffix of script filename.
* lib/xmlrpc/server.rb: refine example code.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpservlet/erbhandler.rb')
| -rw-r--r-- | lib/webrick/httpservlet/erbhandler.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb index 40b7a5761..b9d5e65b6 100644 --- a/lib/webrick/httpservlet/erbhandler.rb +++ b/lib/webrick/httpservlet/erbhandler.rb @@ -29,7 +29,8 @@ module WEBrick begin data = open(@script_filename){|io| io.read } res.body = evaluate(ERB.new(data), req, res) - res['content-type'] = "text/html" + res['content-type'] = + HTTPUtils::mime_type(@script_filename, @config[:MimeTypes]) rescue StandardError => ex raise rescue Exception => ex |