nobu	2013-05-20 09:53:40 +0900 (Mon, 20 May 2013)

  New Revision: 40847

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40847

  Log:
    filehandler.rb: revert r20152
    
    * lib/webrick/httpservlet/filehandler.rb (set_dir_list): revert r20152
      partially and fix misuse of bytesize and regexp repetition operator.

  Modified files:
    trunk/ChangeLog
    trunk/lib/webrick/httpservlet/filehandler.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40846)
+++ ChangeLog	(revision 40847)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon May 20 09:53:31 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@z...>
 
 	* lib/profiler.rb: Document Profiler__ methods
Index: lib/webrick/httpservlet/filehandler.rb
===================================================================
--- lib/webrick/httpservlet/filehandler.rb	(revision 40846)
+++ lib/webrick/httpservlet/filehandler.rb	(revision 40847)
@@ -457,13 +457,11 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/filehandler.rb#L457
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/