summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/cgi.rb2
-rw-r--r--lib/delegate.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 7f1f42260e..f8158858f3 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -923,7 +923,7 @@ class CGI
%w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
define_method(env.sub(/^HTTP_/n, '').downcase) do
- val = env_table[env] && Integer(val)
+ (val = env_table[env]) && Integer(val)
end
end
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 1ba4cf1e1b..0069109624 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -27,6 +27,7 @@ class Delegator
preserved |= t.protected_instance_methods(false)
break if t == Delegator
end
+ preserved << "singleton_method_added"
for method in obj.methods
next if preserved.include? method
begin
@@ -37,7 +38,7 @@ class Delegator
rescue Exception
$@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
$@.delete_if{|s| /^\\(eval\\):/ =~ s}
- raise
+ Kernel::raise
end
end
EOS