ruby-changes:22358
From: tenderlove <ko1@a...>
Date: Wed, 1 Feb 2012 04:11:17 +0900 (JST)
Subject: [ruby-changes:22358] tenderlove:r34407 (ruby_1_9_2): merging r34364 from trunk into ruby_1_9_2
tenderlove 2012-02-01 04:11:05 +0900 (Wed, 01 Feb 2012) New Revision: 34407 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34407 Log: merging r34364 from trunk into ruby_1_9_2 -- * lib/uri/common.rb (URI.encode_www_form_component): initialize on requiring to support JRuby, which runs parallel multithreads. [ruby-core:42222] [Bug #5925] * lib/uri/common.rb (URI.decode_www_form_component): initialize on Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/lib/uri/common.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 34406) +++ ruby_1_9_2/ChangeLog (revision 34407) @@ -1,3 +1,11 @@ +Tue Jan 24 11:38:05 2012 NARUSE, Yui <naruse@r...> + + * lib/uri/common.rb (URI.encode_www_form_component): initialize on + requiring to support JRuby, which runs parallel multithreads. + [ruby-core:42222] [Bug #5925] + + * lib/uri/common.rb (URI.decode_www_form_component): initialize on + Mon Jan 16 16:41:53 2012 Nobuyoshi Nakada <nobu@r...> * lib/optparse.rb (Regexp): fix incorrect options when casting to Index: ruby_1_9_2/lib/uri/common.rb =================================================================== --- ruby_1_9_2/lib/uri/common.rb (revision 34406) +++ ruby_1_9_2/lib/uri/common.rb (revision 34407) @@ -717,7 +717,22 @@ end TBLENCWWWCOMP_ = {} # :nodoc: + 256.times do |i| + TBLENCWWWCOMP_[i.chr] = '%%%02X' % i + end + TBLENCWWWCOMP_[' '] = '+' + TBLENCWWWCOMP_.freeze TBLDECWWWCOMP_ = {} # :nodoc: + 256.times do |i| + h, l = i>>4, i&15 + TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr + TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr + TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr + TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr + end + TBLDECWWWCOMP_['+'] = ' ' + TBLDECWWWCOMP_.freeze + HTML5ASCIIINCOMPAT = [Encoding::UTF_7, Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE] # :nodoc: @@ -730,18 +745,6 @@ # # See URI.decode_www_form_component, URI.encode_www_form def self.encode_www_form_component(str) - if TBLENCWWWCOMP_.empty? - tbl = {} - 256.times do |i| - tbl[i.chr] = '%%%02X' % i - end - tbl[' '] = '+' - begin - TBLENCWWWCOMP_.replace(tbl) - TBLENCWWWCOMP_.freeze - rescue - end - end str = str.to_s if HTML5ASCIIINCOMPAT.include?(str.encoding) str = str.encode(Encoding::UTF_8) @@ -759,22 +762,6 @@ # # See URI.encode_www_form_component, URI.decode_www_form def self.decode_www_form_component(str, enc=Encoding::UTF_8) - if TBLDECWWWCOMP_.empty? - tbl = {} - 256.times do |i| - h, l = i>>4, i&15 - tbl['%%%X%X' % [h, l]] = i.chr - tbl['%%%x%X' % [h, l]] = i.chr - tbl['%%%X%x' % [h, l]] = i.chr - tbl['%%%x%x' % [h, l]] = i.chr - end - tbl['+'] = ' ' - begin - TBLDECWWWCOMP_.replace(tbl) - TBLDECWWWCOMP_.freeze - rescue - end - end raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%\h\h|[^%]+)*\z/ =~ str str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc) end Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 34406) +++ ruby_1_9_2/version.h (revision 34407) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 312 +#define RUBY_PATCHLEVEL 313 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/