diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi/session/pstore.rb | 6 | ||||
| -rw-r--r-- | lib/delegate.rb | 9 | ||||
| -rw-r--r-- | lib/tempfile.rb | 10 | ||||
| -rw-r--r-- | lib/xsd/charset.rb | 2 |
4 files changed, 19 insertions, 8 deletions
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb index 033acc3249..10f3e8f75f 100644 --- a/lib/cgi/session/pstore.rb +++ b/lib/cgi/session/pstore.rb @@ -76,11 +76,7 @@ class CGI def restore unless @hash @p.transaction do - begin - @hash = @p['hash'] - rescue - @hash = {} - end + @hash = @p['hash'] || {} end end @hash diff --git a/lib/delegate.rb b/lib/delegate.rb index a14d62cf5b..ee574cb02b 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -75,6 +75,11 @@ class SimpleDelegator<Delegator def __setobj__(obj) @_sd_obj = obj end + + def initialize_copy(obj) + super + __setobj__(obj.__getobj__.clone) + end end # backward compatibility ^_^;;; @@ -103,6 +108,10 @@ def DelegateClass(superclass) def __setobj__(obj) @_dc_obj = obj end + def initialize_copy(obj) + super + __setobj__(obj.__getobj__.clone) + end } for method in methods begin diff --git a/lib/tempfile.rb b/lib/tempfile.rb index b13e5ff61f..cea229132a 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -111,8 +111,14 @@ class Tempfile < DelegateClass(File) # file. def unlink # keep this order for thread safeness - File.unlink(@tmpname) if File.exist?(@tmpname) - @@cleanlist.delete(@tmpname) if @@cleanlist + begin + File.unlink(@tmpname) if File.exist?(@tmpname) + @@cleanlist.delete(@tmpname) + @data = @tmpname = nil + ObjectSpace.undefine_finalizer(self) + rescue Errno::EACCESS + # may not be able to unlink on Windows; just ignore + end end alias delete unlink diff --git a/lib/xsd/charset.rb b/lib/xsd/charset.rb index 362f13edfc..e0241fdebc 100644 --- a/lib/xsd/charset.rb +++ b/lib/xsd/charset.rb @@ -103,7 +103,7 @@ public end def Charset.charset_str(label) - CharsetMap.index(label.downcase) + CharsetMap.key(label.downcase) end # us_ascii = '[\x00-\x7F]' |