summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-26 02:28:54 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-26 02:28:54 +0000
commit7b6677f1e60d6a4c4e8927550ba775321a389ce6 (patch)
treebceb533a71d8c95f25716bea1cef7171560a0e8c
parent36a1e76053e0f80d9c8239c134a0bd3574eb087d (diff)
* lib/webrick/httputils.rb: Add MIME Type definition of .js and .svg.
patched by Hal Brodigan. [ruby-core:39704] [Bug #5365] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/httputils.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e84f195d8a..1964d66472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 26 11:27:38 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/webrick/httputils.rb: Add MIME Type definition of .js and .svg.
+ patched by Hal Brodigan. [ruby-core:39704] [Bug #5365]
+
Mon Sep 26 09:20:44 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* configure.in: remove DJGPP support. It's not longer supported
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index f029dacb56..57ae364b35 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -57,6 +57,7 @@ module WEBrick
"jpe" => "image/jpeg",
"jpeg" => "image/jpeg",
"jpg" => "image/jpeg",
+ "js" => "application/javascript",
"lha" => "application/octet-stream",
"lzh" => "application/octet-stream",
"mov" => "video/quicktime",
@@ -78,6 +79,7 @@ module WEBrick
"rtf" => "application/rtf",
"sgm" => "text/sgml",
"sgml" => "text/sgml",
+ "svg" => "image/svg+xml",
"tif" => "image/tiff",
"tiff" => "image/tiff",
"txt" => "text/plain",