diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 2 | ||||
| -rw-r--r-- | lib/monitor.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 1f5a3b0701..43122212d5 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -880,7 +880,7 @@ class CGI cookies = Hash.new([]) return cookies unless raw_cookie - raw_cookie.split(/[;,] /).each do |pairs| + raw_cookie.split(/[;,]\s?/).each do |pairs| name, values = pairs.split('=',2) next unless name and values name = CGI::unescape(name) diff --git a/lib/monitor.rb b/lib/monitor.rb index c1ce7815ea..e56480b763 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -87,11 +87,11 @@ module MonitorMixin class Timeout < Exception; end def wait(timeout = nil) - @monitor.fcall(:mon_check_owner) + @monitor.funcall(:mon_check_owner) timer = create_timer(timeout) Thread.critical = true - count = @monitor.fcall(:mon_exit_for_cond) + count = @monitor.funcall(:mon_exit_for_cond) @waiters.push(Thread.current) begin @@ -107,7 +107,7 @@ module MonitorMixin if @waiters.include?(Thread.current) # interrupted? @waiters.delete(Thread.current) end - @monitor.fcall(:mon_enter_for_cond, count) + @monitor.funcall(:mon_enter_for_cond, count) Thread.critical = false end end @@ -125,7 +125,7 @@ module MonitorMixin end def signal - @monitor.fcall(:mon_check_owner) + @monitor.funcall(:mon_check_owner) Thread.critical = true t = @waiters.shift t.wakeup if t @@ -134,7 +134,7 @@ module MonitorMixin end def broadcast - @monitor.fcall(:mon_check_owner) + @monitor.funcall(:mon_check_owner) Thread.critical = true for t in @waiters t.wakeup @@ -172,7 +172,7 @@ module MonitorMixin def self.extend_object(obj) super(obj) - obj.fcall(:mon_initialize) + obj.funcall(:mon_initialize) end # |