diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-20 00:53:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-20 00:53:40 +0000 |
| commit | bcddf03238140babb6112d289fd88e118390d4ce (patch) | |
| tree | 8b847977b5f9f26bbffc7ffd0690eea470f35036 | |
| parent | eb9cd6b11eb4bca2df2ea355b4c53e87f51862ff (diff) | |
filehandler.rb: revert r20152
* lib/webrick/httpservlet/filehandler.rb (set_dir_list): revert r20152
partially and fix misuse of bytesize and regexp repetition operator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/filehandler.rb | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon May 20 09:53:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/webrick/httpservlet/filehandler.rb (set_dir_list): revert r20152 + partially and fix misuse of bytesize and regexp repetition operator. + Mon May 20 08:03:51 2013 Zachary Scott <zachary@zacharyscott.net> * lib/profiler.rb: Document Profiler__ methods diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb index d8c66dfdc3..711ba30176 100644 --- a/lib/webrick/httpservlet/filehandler.rb +++ b/lib/webrick/httpservlet/filehandler.rb @@ -457,13 +457,11 @@ module WEBrick list.each{ |name, time, size| if name == ".." dname = "Parent Directory" - elsif name.bytesize > 25 - dname = name.sub(/^(.{23})(?:.*)/, '\1..') else - dname = name + dname = name[0...23] << '..' end s = " <A HREF=\"#{HTTPUtils::escape(name)}\">#{HTMLUtils::escape(dname)}</A>" - s << " " * (30 - dname.bytesize) + s << " " * (30 - dname.size) s << (time ? time.strftime("%Y/%m/%d %H:%M ") : " " * 22) s << (size >= 0 ? size.to_s : "-") << "\n" res.body << s |