Backport #5935 ยป backport.patch
| ChangeLog | ||
|---|---|---|
|
Tue Jan 24 11:38:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
|
||
|
* 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@ruby-lang.org>
|
||
|
* lib/optparse.rb (Regexp): fix incorrect options when casting to
|
||
| lib/uri/common.rb | ||
|---|---|---|
|
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:
|
||
| ... | ... | |
|
#
|
||
|
# 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)
|
||
| ... | ... | |
|
#
|
||
|
# 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
|
||
| version.h | ||
|---|---|---|
|
#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
|
||