jruby · Oct 28, 2014 · Oct 28, 2014 · Oct 28, 2014 · Oct 28, 2014
diff --git a/lib/ruby/1.8/resolv.rb b/lib/ruby/1.8/resolv.rb
@@ -855,7 +855,6 @@ def Config.default_config_hash(filename="/etc/resolv.conf")
         if File.exist? filename
           config_hash = Config.parse_resolv_conf(filename)
         else
-          require 'rbconfig'
           if WINDOWS
             require 'win32/resolv'
             search, nameserver = Win32::Resolv.get_resolv_info

diff --git a/lib/ruby/1.8/rexml/entity.rb b/lib/ruby/1.8/rexml/entity.rb
@@ -138,8 +138,14 @@ def value
 				matches = @value.scan(PEREFERENCE_RE)
 				rv = @value.clone
 				if @parent
+					sum = 0
 					matches.each do |entity_reference|
 						entity_value = @parent.entity( entity_reference[0] )
+						if sum + entity_value.bytesize > Document.entity_expansion_text_limit
+							raise "entity expansion has grown too large"
+						else
+							sum += entity_value.bytesize
+						end
 						rv.gsub!( /%#{entity_reference};/um, entity_value )
 					end
 				end

diff --git a/lib/ruby/1.9/cgi/core.rb b/lib/ruby/1.9/cgi/core.rb
@@ -478,10 +478,12 @@ def read_multipart(boundary, content_length)
       bufsize = 10 * 1024
       max_count = MAX_MULTIPART_COUNT
       n = 0
+      tempfiles = []
       while true
         (n += 1) < max_count or raise StandardError.new("too many parameters.")
         ## create body (StringIO or Tempfile)
         body = create_body(bufsize < content_length)
+        tempfiles << body if defined?(Tempfile) && body.kind_of?(Tempfile)
         class << body
           if method_defined?(:path)
             alias local_path path
@@ -562,6 +564,15 @@ class << params[name].last;self;end.class_eval do
       raise EOFError, "bad boundary end of body part" unless boundary_end =~ /--/
       params.default = []
       params
+    rescue Exception
+      if tempfiles
+        tempfiles.each {|t|
+          if t.path
+            t.unlink
+          end
+        }
+      end
+      raise
     end # read_multipart
     private :read_multipart
     def create_body(is_large)  #:nodoc:

diff --git a/lib/ruby/1.9/dl/func.rb b/lib/ruby/1.9/dl/func.rb
@@ -92,6 +92,9 @@ def call(*args, &block)
         super
       else
         funcs = []
+        if $SAFE >= 1 && args.any? { |x| x.tainted? }
+          raise SecurityError, "tainted parameter not allowed"
+        end
         _args = wrap_args(args, @stack.types, funcs, &block)
         r = @cfunc.call(@stack.pack(_args))
         funcs.each{|f| f.unbind_at_call()}

diff --git a/lib/ruby/1.9/drb/ssl.rb b/lib/ruby/1.9/drb/ssl.rb
@@ -179,8 +179,9 @@ def accept
       end
       begin
 	ssl = @config.accept(soc)
-      ensure
-        soc.close if $!
+      rescue Exception
+        soc.close
+        raise
       end
       self.class.new(uri, ssl, @config, true)
       rescue OpenSSL::SSL::SSLError

diff --git a/lib/ruby/1.9/gserver.rb b/lib/ruby/1.9/gserver.rb
@@ -3,7 +3,7 @@
 #
 # Author::        John W. Small
 # Documentation:: Gavin Sinclair
-# Licence::       Freeware.
+# Licence::       Ruby License
 
 require "socket"
 require "thread"

diff --git a/lib/ruby/1.9/ipaddr.rb b/lib/ruby/1.9/ipaddr.rb
@@ -392,7 +392,7 @@ def set(addr, *family)
     return self
   end
 
-  # Set current netmask to given mask. 
+  # Set current netmask to given mask.
   def mask!(mask)
     if mask.kind_of?(String)
       if mask =~ /^\d+$/
@@ -534,7 +534,8 @@ def in6_addr(left)
         left = $1
         right = $3 + '0:0'
       else
-        left.count(':') <= 7 or raise ArgumentError, "invalid address"
+        left.count(':') <= ($1.empty? || $2.empty? ? 8 : 7) or
+          raise InvalidAddressError, "invalid address"
         left = $1
         right = $2
         addr = 0
@@ -626,7 +627,7 @@ def valid_v6?(addr)
 
     # Returns a +String+ based representation of a valid DNS hostname,
     # IPv4 or IPv6 address.
-    # 
+    #
     #   IPSocket.getaddress 'localhost'         #=> "::1"
     #   IPSocket.getaddress 'broadcasthost'     #=> "255.255.255.255"
     #   IPSocket.getaddress 'www.ruby-lang.org' #=> "221.186.184.68"
@@ -656,6 +657,8 @@ def test_s_new
       ["0:0:0:1::"],
       ["2001:200:300::/48"],
       ["2001:200:300::192.168.1.2/48"],
+      ["1:2:3:4:5:6:7::"],
+      ["::2:3:4:5:6:7:8"],
     ].each { |args|
       assert_nothing_raised {
         IPAddr.new(*args)
@@ -712,6 +715,8 @@ def test_s_new
     assert_equal("2001:200:300::", IPAddr.new("2001:200:300::/48").to_s)
 
     assert_equal("2001:200:300::", IPAddr.new("[2001:200:300::]/48").to_s)
+    assert_equal("1:2:3:4:5:6:7:0", IPAddr.new("1:2:3:4:5:6:7::").to_s)
+    assert_equal("0:2:3:4:5:6:7:8", IPAddr.new("::2:3:4:5:6:7:8").to_s)
 
     [
       ["192.168.0.256"],

diff --git a/lib/ruby/1.9/net/http.rb b/lib/ruby/1.9/net/http.rb
@@ -623,13 +623,13 @@ def set_debug_output(output)
     # Number of seconds to wait for the connection to open. Any number
     # may be used, including Floats for fractional seconds. If the HTTP
     # object cannot open a connection in this many seconds, it raises a
-    # TimeoutError exception.
+    # TimeoutError exception. The default value is +nil+.
     attr_accessor :open_timeout
 
     # Number of seconds to wait for one block to be read (via one read(2)
     # call). Any number may be used, including Floats for fractional
     # seconds. If the HTTP object cannot read data in this many seconds,
-    # it raises a TimeoutError exception.
+    # it raises a TimeoutError exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Setter for the read_timeout attribute.
@@ -638,8 +638,9 @@ def read_timeout=(sec)
       @read_timeout = sec
     end
 
-    # Seconds to wait for 100 Continue response.  If the HTTP object does not
-    # receive a response in this many seconds it sends the request body.
+    # Seconds to wait for 100 Continue response. If the HTTP object does not
+    # receive a response in this many seconds it sends the request body. The
+    # default value is +nil+.
     attr_reader :continue_timeout
 
     # Setter for the continue_timeout attribute.
@@ -1955,7 +1956,7 @@ def send_request_with_body_stream(sock, ver, path, f)
       wait_for_continue sock, ver if sock.continue_timeout
       if chunked?
         while s = f.read(1024)
-          sock.write(sprintf("%x\r\n", s.length) << s << "\r\n")
+          sock.write(sprintf("%x\r\n", s.bytesize) << s << "\r\n")
         end
         sock.write "0\r\n\r\n"
       else

diff --git a/lib/ruby/1.9/net/imap.rb b/lib/ruby/1.9/net/imap.rb
@@ -1725,7 +1725,7 @@ def ensure_nz_number(num)
     # rights:: The access rights the indicated user has to the
     #          mailbox.
     #
-    MailboxACLItem = Struct.new(:user, :rights)
+    MailboxACLItem = Struct.new(:user, :rights, :mailbox)
 
     # Net::IMAP::StatusData represents contents of the STATUS response.
     #
@@ -2722,6 +2722,7 @@ def getacl_response
         token = match(T_ATOM)
         name = token.value.upcase
         match(T_SPACE)
+        mailbox = astring
         data = []
         token = lookahead
         if token.symbol == T_SPACE
@@ -2737,8 +2738,7 @@ def getacl_response
             user = astring
             match(T_SPACE)
             rights = astring
-            ##XXX data.push([user, rights])
-            data.push(MailboxACLItem.new(user, rights))
+            data.push(MailboxACLItem.new(user, rights, mailbox))
           end
         end
         return UntaggedResponse.new(name, data, @str)
@@ -2869,6 +2869,7 @@ def capability_response
             break
           when T_SPACE
             shift_token
+            next
           end
           data.push(atom.upcase)
         end

diff --git a/lib/ruby/1.9/net/pop.rb b/lib/ruby/1.9/net/pop.rb
@@ -498,12 +498,12 @@ def port
 
     # Seconds to wait until a connection is opened.
     # If the POP3 object cannot open a connection within this time,
-    # it raises a TimeoutError exception.
+    # it raises a TimeoutError exception. The default value is 30 seconds.
     attr_accessor :open_timeout
 
     # Seconds to wait until reading one block (by one read(1) call).
     # If the POP3 object cannot complete a read() within this time,
-    # it raises a TimeoutError exception.
+    # it raises a TimeoutError exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Set the read timeout.

diff --git a/lib/ruby/1.9/net/smtp.rb b/lib/ruby/1.9/net/smtp.rb
@@ -78,8 +78,9 @@ class SMTPUnsupportedCommand < ProtocolError
   #
   # This library does NOT provide functions to compose internet mails.
   # You must create them by yourself. If you want better mail support,
-  # try RubyMail or TMail. You can get both libraries from RAA.
-  # (http://www.ruby-lang.org/en/raa.html)
+  # try RubyMail or TMail or search for alternatives in
+  # {RubyGems.org}[https://rubygems.org/] or {The Ruby
+  # Toolbox}[https://www.ruby-toolbox.com/].
   #
   # FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt).
   #
@@ -364,12 +365,12 @@ def disable_starttls
 
     # Seconds to wait while attempting to open a connection.
     # If the connection cannot be opened within this time, a
-    # TimeoutError is raised.
+    # TimeoutError is raised. The default value is 30 seconds.
     attr_accessor :open_timeout
 
     # Seconds to wait while reading one block (by one read(2) call).
     # If the read(2) call does not complete within this time, a
-    # TimeoutError is raised.
+    # TimeoutError is raised. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Set the number of seconds to wait until timing-out a read(2)
@@ -934,11 +935,11 @@ def recv_response
     end
 
     def critical(&block)
-      return '200 dummy reply code' if @error_occured
+      return Response.parse('200 dummy reply code') if @error_occurred
       begin
         return yield()
       rescue Exception
-        @error_occured = true
+        @error_occurred = true
         raise
       end
     end

diff --git a/lib/ruby/1.9/open-uri.rb b/lib/ruby/1.9/open-uri.rb
@@ -72,7 +72,7 @@ def open(name, *rest, &block) # :doc:
 # The environment variables such as http_proxy, https_proxy and ftp_proxy
 # are in effect by default.  :proxy => nil disables proxy.
 #
-#   open("http://www.ruby-lang.org/en/raa.html", :proxy => nil) {|f|
+#   open("http://www.ruby-lang.org/en/", :proxy => nil) {|f|
 #     # ...
 #   }
 #
@@ -508,8 +508,9 @@ def charset
       end
     end
 
-    # returns a list of encodings in Content-Encoding field
-    # as an Array of String.
+    # Returns a list of encodings in Content-Encoding field as an array of
+    # strings.
+    #
     # The encodings are downcased for canonicalization.
     def content_encoding
       v = @meta['content-encoding']

diff --git a/lib/ruby/1.9/optparse.rb b/lib/ruby/1.9/optparse.rb
@@ -1631,23 +1631,30 @@ def environment(env = File.basename($0, '.*'))
   decimal = '\d+(?:_\d+)*'
   binary = 'b[01]+(?:_[01]+)*'
   hex = 'x[\da-f]+(?:_[\da-f]+)*'
-  octal = "0(?:[0-7]*(?:_[0-7]+)*|#{binary}|#{hex})"
+  octal = "0(?:[0-7]+(?:_[0-7]+)*|#{binary}|#{hex})?"
   integer = "#{octal}|#{decimal}"
-  accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s,| Integer(s) if s}
+
+  accept(Integer, %r"\A[-+]?(?:#{integer})\z"io) {|s,|
+    begin
+      Integer(s)
+    rescue ArgumentError
+      raise OptionParser::InvalidArgument, s
+    end if s
+  }
 
   #
   # Float number format, and converts to Float.
   #
   float = "(?:#{decimal}(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
-  floatpat = %r"\A[-+]?#{float}"io
+  floatpat = %r"\A[-+]?#{float}\z"io
   accept(Float, floatpat) {|s,| s.to_f if s}
 
   #
   # Generic numeric format, converts to Integer for integer format, Float
   # for float format, and Rational for rational format.
   #
   real = "[-+]?(?:#{octal}|#{float})"
-  accept(Numeric, /\A(#{real})(?:\/(#{real}))?/io) {|s, d, n|
+  accept(Numeric, /\A(#{real})(?:\/(#{real}))?\z/io) {|s, d, n|
     if n
       Rational(d, n)
     elsif s
@@ -1658,22 +1665,40 @@ def environment(env = File.basename($0, '.*'))
   #
   # Decimal integer format, to be converted to Integer.
   #
-  DecimalInteger = /\A[-+]?#{decimal}/io
-  accept(DecimalInteger) {|s,| s.to_i if s}
+  DecimalInteger = /\A[-+]?#{decimal}\z/io
+  accept(DecimalInteger, DecimalInteger) {|s,|
+    begin
+      Integer(s)
+    rescue ArgumentError
+      raise OptionParser::InvalidArgument, s
+    end if s
+  }
 
   #
   # Ruby/C like octal/hexadecimal/binary integer format, to be converted to
   # Integer.
   #
-  OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))/io
-  accept(OctalInteger) {|s,| s.oct if s}
+  OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))\z/io
+  accept(OctalInteger, OctalInteger) {|s,|
+    begin
+      Integer(s, 8)
+    rescue ArgumentError
+      raise OptionParser::InvalidArgument, s
+    end if s
+  }
 
   #
   # Decimal integer/float number format, to be converted to Integer for
   # integer format, Float for float format.
   #
   DecimalNumeric = floatpat     # decimal integer is allowed as float also.
-  accept(DecimalNumeric) {|s,| eval(s) if s}
+  accept(DecimalNumeric, floatpat) {|s,|
+    begin
+      eval(s)
+    rescue SyntaxError
+      raise OptionParser::InvalidArgument, s
+    end if s
+  }
 
   #
   # Boolean switch, which means whether it is present or not, whether it is

diff --git a/lib/ruby/1.9/rake.rb b/lib/ruby/1.9/rake.rb
@@ -40,12 +40,9 @@
 
 require 'rake/win32'
 
-require 'rake/linked_list'
-require 'rake/scope'
 require 'rake/task_argument_error'
 require 'rake/rule_recursion_overflow_error'
 require 'rake/rake_module'
-require 'rake/trace_output'
 require 'rake/pseudo_status'
 require 'rake/task_arguments'
 require 'rake/invocation_chain'
@@ -61,7 +58,6 @@
 require 'rake/name_space'
 require 'rake/task_manager'
 require 'rake/application'
-require 'rake/backtrace'
 
 $trace = false