summaryrefslogtreecommitdiffstats
path: root/lib/webrick/httpservlet
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-09 06:04:59 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-09 06:04:59 +0000
commit574ea813f85a608133ae7be03894fc9561af5160 (patch)
tree49ab9045143b3cb975033fbc793a13dc480496fd /lib/webrick/httpservlet
parent08307aea759f8e82332612ac2a85112d38692504 (diff)
downloadruby-574ea813f85a608133ae7be03894fc9561af5160.tar.gz
ruby-574ea813f85a608133ae7be03894fc9561af5160.tar.xz
ruby-574ea813f85a608133ae7be03894fc9561af5160.zip
* lib/webrick/httpservlet/erbhandler.rb
(WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type by suffix of script filename. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpservlet')
-rw-r--r--lib/webrick/httpservlet/erbhandler.rb3
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