[前][次][番号順一覧][スレッド一覧]

ruby-changes:8664

From: yugui <ko1@a...>
Date: Tue, 11 Nov 2008 20:01:52 +0900 (JST)
Subject: [ruby-changes:8664] Ruby:r20199 (ruby_1_9_1): merges r20152 from trunk into ruby_1_9_1.

yugui	2008-11-11 20:01:31 +0900 (Tue, 11 Nov 2008)

  New Revision: 20199

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

  Log:
    merges r20152 from trunk into ruby_1_9_1.
    * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#do_CONNECT):
      use #bytesize instead of #size.  a patch submitted from
      raspberry lemon in  [ruby-core:18571].
    * lib/webrick/httpauth/digestauth.rb, lib/webrick/httpproxy.rb,
      lib/webrick/httprequest.rb, lib/webrick/httpservlet/cgi_runner.rb,
      lib/webrick/httpservlet/abstract.rb, lib/webrick/httpresponse.rb,
      lib/webrick/httpservlet/cgihandler.rb, lib/webrick/utils.rb: ditto.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/webrick/httpauth/digestauth.rb
    branches/ruby_1_9_1/lib/webrick/httpproxy.rb
    branches/ruby_1_9_1/lib/webrick/httprequest.rb
    branches/ruby_1_9_1/lib/webrick/httpresponse.rb
    branches/ruby_1_9_1/lib/webrick/httpservlet/abstract.rb
    branches/ruby_1_9_1/lib/webrick/httpservlet/cgi_runner.rb
    branches/ruby_1_9_1/lib/webrick/httpservlet/cgihandler.rb
    branches/ruby_1_9_1/lib/webrick/httpservlet/filehandler.rb
    branches/ruby_1_9_1/lib/webrick/utils.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20198)
+++ ruby_1_9_1/ChangeLog	(revision 20199)
@@ -1,3 +1,14 @@
+Sat Nov  8 18:11:14 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#do_CONNECT):
+	  use #bytesize instead of #size.  a patch submitted from
+	  raspberry lemon in  [ruby-core:18571].
+
+	* lib/webrick/httpauth/digestauth.rb, lib/webrick/httpproxy.rb,
+	  lib/webrick/httprequest.rb, lib/webrick/httpservlet/cgi_runner.rb,
+	  lib/webrick/httpservlet/abstract.rb, lib/webrick/httpresponse.rb,
+	  lib/webrick/httpservlet/cgihandler.rb, lib/webrick/utils.rb: ditto.
+
 Sat Nov  8 17:31:41 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/stringio/stringio.c (strio_ungetc): ungetc position should
Index: ruby_1_9_1/lib/webrick/httpproxy.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpproxy.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpproxy.rb	(revision 20199)
@@ -146,11 +146,11 @@
         while fds = IO::select([ua, os])
           if fds[0].member?(ua)
             buf = ua.sysread(1024);
-            @logger.debug("CONNECT: #{buf.size} byte from User-Agent")
+            @logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
             os.syswrite(buf)
           elsif fds[0].member?(os)
             buf = os.sysread(1024);
-            @logger.debug("CONNECT: #{buf.size} byte from #{host}:#{port}")
+            @logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
             ua.syswrite(buf)
           end
         end
Index: ruby_1_9_1/lib/webrick/httpservlet/filehandler.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpservlet/filehandler.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpservlet/filehandler.rb	(revision 20199)
@@ -407,13 +407,13 @@
         list.each{ |name, time, size|
           if name == ".."
             dname = "Parent Directory"
-          elsif name.size > 25
+          elsif name.bytesize > 25
             dname = name.sub(/^(.{23})(?:.*)/, '\1..')
           else
             dname = name
           end
           s =  " <A HREF=\"#{HTTPUtils::escape(name)}\">#{dname}</A>"
-          s << " " * (30 - dname.size)
+          s << " " * (30 - dname.bytesize)
           s << (time ? time.strftime("%Y/%m/%d %H:%M      ") : " " * 22)
           s << (size >= 0 ? size.to_s : "-") << "\n"
           res.body << s
Index: ruby_1_9_1/lib/webrick/httpservlet/cgihandler.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpservlet/cgihandler.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpservlet/cgihandler.rb	(revision 20199)
@@ -48,14 +48,14 @@
           end
           dump = Marshal.dump(meta)
 
-          cgi_in.write("%8d" % cgi_out.path.size)
+          cgi_in.write("%8d" % cgi_out.path.bytesize)
           cgi_in.write(cgi_out.path)
-          cgi_in.write("%8d" % cgi_err.path.size)
+          cgi_in.write("%8d" % cgi_err.path.bytesize)
           cgi_in.write(cgi_err.path)
-          cgi_in.write("%8d" % dump.size)
+          cgi_in.write("%8d" % dump.bytesize)
           cgi_in.write(dump)
 
-          if req.body and req.body.size > 0
+          if req.body and req.body.bytesize > 0
             cgi_in.write(req.body)
           end
         ensure
@@ -65,7 +65,7 @@
           data = cgi_out.read
           cgi_out.close(true)
           if errmsg = cgi_err.read
-            if errmsg.size > 0
+            if errmsg.bytesize > 0
               @logger.error("CGIHandler: #{@script_filename}:\n" + errmsg)
             end
           end 
Index: ruby_1_9_1/lib/webrick/httpservlet/abstract.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpservlet/abstract.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpservlet/abstract.rb	(revision 20199)
@@ -59,7 +59,7 @@
       def redirect_to_directory_uri(req, res)
         if req.path[-1] != ?/
           location = WEBrick::HTTPUtils.escape_path(req.path + "/")
-          if req.query_string && req.query_string.size > 0
+          if req.query_string && req.query_string.bytesize > 0
             location << "?" << req.query_string
           end
           res.set_redirect(HTTPStatus::MovedPermanently, location)
Index: ruby_1_9_1/lib/webrick/httpservlet/cgi_runner.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpservlet/cgi_runner.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpservlet/cgi_runner.rb	(revision 20199)
@@ -13,7 +13,7 @@
   while size > 0
     tmp = io.sysread(size)
     buf << tmp
-    size -= tmp.size
+    size -= tmp.bytesize
   end
   return buf
 end
Index: ruby_1_9_1/lib/webrick/httprequest.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httprequest.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httprequest.rb	(revision 20199)
@@ -244,7 +244,7 @@
 
     def read_request_line(socket)
       @request_line = read_line(socket, 1024) if socket
-      if @request_line.size >= 1024 and @request_line[-1, 1] != LF
+      if @request_line.bytesize >= 1024 and @request_line[-1, 1] != LF
         raise HTTPStatus::RequestURITooLarge
       end
       @request_time = Time.now
@@ -307,7 +307,7 @@
         while @remaining_size > 0 
           sz = [@buffer_size, @remaining_size].min
           break unless buf = read_data(socket, sz)
-          @remaining_size -= buf.size
+          @remaining_size -= buf.bytesize
           block.call(buf)
         end
         if @remaining_size > 0 && @socket.eof?
@@ -334,7 +334,7 @@
       chunk_size, = read_chunk_size(socket)
       while chunk_size > 0
         data = read_data(socket, chunk_size) # read chunk-data
-        if data.nil? || data.size != chunk_size
+        if data.nil? || data.bytesize != chunk_size
           raise BadRequest, "bad chunk data size."
         end
         read_line(socket)                    # skip CRLF
Index: ruby_1_9_1/lib/webrick/httpresponse.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpresponse.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpresponse.rb	(revision 20199)
@@ -142,7 +142,7 @@
         @header.delete('content-length')
       elsif @header['content-length'].nil?
         unless @body.is_a?(IO)
-          @header['content-length'] = @body ? @body.size : 0
+          @header['content-length'] = @body ? @body.bytesize : 0
         end
       end
 
@@ -260,10 +260,10 @@
           while buf = @body.read(@buffer_size)
             next if buf.empty?
             data = ""
-            data << format("%x", buf.size) << CRLF
+            data << format("%x", buf.bytesize) << CRLF
             data << buf << CRLF
             _write_data(socket, data)
-            @sent_size += buf.size
+            @sent_size += buf.bytesize
           end
           _write_data(socket, "0#{CRLF}#{CRLF}")
         else
@@ -280,20 +280,20 @@
       if @request_method == "HEAD"
         # do nothing
       elsif chunked?
-        remain = body ? @body.size : 0
+        remain = body ? @body.bytesize : 0
         while buf = @body[@sent_size, @buffer_size]
           break if buf.empty?
           data = ""
-          data << format("%x", buf.size) << CRLF
+          data << format("%x", buf.bytesize) << CRLF
           data << buf << CRLF
           _write_data(socket, data)
-          @sent_size += buf.size
+          @sent_size += buf.bytesize
         end
         _write_data(socket, "0#{CRLF}#{CRLF}")
       else
-        if @body && @body.size > 0
+        if @body && @body.bytesize > 0
           _write_data(socket, @body)
-          @sent_size = @body.size
+          @sent_size = @body.bytesize
         end
       end
     end
@@ -302,7 +302,7 @@
       while offset > 0
         sz = @buffer_size < size ? @buffer_size : size
         buf = input.read(sz)
-        offset -= buf.size
+        offset -= buf.bytesize
       end
 
       if size == 0
@@ -314,7 +314,7 @@
           sz = @buffer_size < size ? @buffer_size : size
           buf = input.read(sz)
           _write_data(output, buf)
-          size -= buf.size
+          size -= buf.bytesize
         end
       end
     end
Index: ruby_1_9_1/lib/webrick/httpauth/digestauth.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpauth/digestauth.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/httpauth/digestauth.rb	(revision 20199)
@@ -229,7 +229,7 @@
 
       def split_param_value(string)
         ret = {}
-        while string.size != 0
+        while string.bytesize != 0
           case string           
           when /^\s*([\w\-\.\*\%\!]+)=\s*\"((\\.|[^\"])*)\"\s*,?/
             key = $1
Index: ruby_1_9_1/lib/webrick/utils.rb
===================================================================
--- ruby_1_9_1/lib/webrick/utils.rb	(revision 20198)
+++ ruby_1_9_1/lib/webrick/utils.rb	(revision 20199)
@@ -89,7 +89,7 @@
                  "abcdefghijklmnopqrstuvwxyz" 
 
     def random_string(len)
-      rand_max = RAND_CHARS.size
+      rand_max = RAND_CHARS.bytesize
       ret = "" 
       len.times{ ret << RAND_CHARS[rand(rand_max)] }
       ret 

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

[前][次][番号順一覧][スレッド一覧]