kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r31266 from trunk into ruby_1_9_2.

Browse source 
--
* lib/uri/common.rb: avoid race condition. fixes #4572

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-29 22:49:36 +00:00
parent d4e840bf26
commit ca0ac3e3c9
3 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Apr 12 19:19:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/common.rb: avoid race condition. fixes #4572
Tue Apr 12 10:37:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/win32.h: VC doesn't have ftruncate() and others, but

28
lib/uri/common.rb
View file

@ -731,11 +731,16 @@ module URI
# 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|
TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
tbl[i.chr] = '%%%02X' % i
end
tbl[' '] = '+'
begin
TBLENCWWWCOMP_.replace(tbl)
TBLENCWWWCOMP_.freeze
rescue
end
TBLENCWWWCOMP_[' '] = '+'
TBLENCWWWCOMP_.freeze
end
str = str.to_s
if HTML5ASCIIINCOMPAT.include?(str.encoding)
@ -755,15 +760,20 @@ module URI
# 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
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
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
TBLDECWWWCOMP_['+'] = ' '
TBLDECWWWCOMP_.freeze
end
raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%\h\h|[^%]+)*\z/ =~ str
str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 226
#define RUBY_PATCHLEVEL 227
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1