* lib/webrick/httpservlet/erbhandler.rb: Allow the ERB document to

drbrain · drbrain · commit 35bb53430c63 · 2011-06-16T05:37:31.000Z
alter the content-type of the response. [Ruby 1.9 - Bug #4685] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 16 14:26:46 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/httpservlet/erbhandler.rb:  Allow the ERB document to
+	  alter the content-type of the response.  [Ruby 1.9 - Bug #4685]
+
 Thu Jun 16 14:15:47 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/timeout.rb: Clarify timeout duration types.  Patch by Alf Mikula.
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
@@ -54,7 +54,7 @@ def do_GET(req, res)
         begin
           data = open(@script_filename){|io| io.read }
           res.body = evaluate(ERB.new(data), req, res)
-          res['content-type'] =
+          res['content-type'] ||=
             HTTPUtils::mime_type(@script_filename, @config[:MimeTypes])
         rescue StandardError => ex
           raise

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Thu Jun 16 14:26:46 2011  Eric Hodel  <[email protected]>
++
 +	* lib/webrick/httpservlet/erbhandler.rb:  Allow the ERB document to
 +	  alter the content-type of the response.  [Ruby 1.9 - Bug #4685]
++
 Thu Jun 16 14:15:47 2011  Eric Hodel  <[email protected]>
 	* lib/timeout.rb: Clarify timeout duration types.  Patch by Alf Mikula.