summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 07:04:50 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 07:04:50 +0000
commit6f191221cc4e7dba4e8311fe3760eb02cc04c4c1 (patch)
tree31382abb3497b2146f4d44061779c5ea89fca46f
parent1b7dd66c97980bca9d09e57235bd8ea3391fd96e (diff)
downloadruby-6f191221cc4e7dba4e8311fe3760eb02cc04c4c1.tar.gz
ruby-6f191221cc4e7dba4e8311fe3760eb02cc04c4c1.tar.xz
ruby-6f191221cc4e7dba4e8311fe3760eb02cc04c4c1.zip
* lib/webrick/httpservlet/filehandler.rb: escape filename of index.
[ruby-dev:37768] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/httpservlet/filehandler.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0624d750e..b896b4416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 6 16:02:15 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/webrick/httpservlet/filehandler.rb: escape filename of index.
+ [ruby-dev:37768]
+
Sun Dec 6 00:35:16 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
* symbian/setup (config.h): EXECUTABLE_EXTS moved from
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 1cac0cabe..3a2f5d3b2 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -412,7 +412,7 @@ module WEBrick
else
dname = name
end
- s = " <A HREF=\"#{HTTPUtils::escape(name)}\">#{dname}</A>"
+ s = " <A HREF=\"#{HTTPUtils::escape(name)}\">#{HTMLUtils::escape(dname)}</A>"
s << " " * (30 - dname.bytesize)
s << (time ? time.strftime("%Y/%m/%d %H:%M ") : " " * 22)
s << (size >= 0 ? size.to_s : "-") << "\n"