aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_ext
diff options
context:
space:
mode:
authorrick <technoweenie@gmail.com>2008-05-31 15:59:01 -0700
committerrick <technoweenie@gmail.com>2008-05-31 15:59:01 -0700
commit2506e5c9a7d251680f0029d1616f3edb1e3a8db3 (patch)
tree1479c9a2d19cb15e179c260eb6135b8adde1927a /actionpack/lib/action_controller/cgi_ext
parent9c4f00350a61987afad50ebb8d319d7e889b6cfd (diff)
parentf32bceeee1adb0979f49db7e8111ba318e23c85c (diff)
downloadrails-2506e5c9a7d251680f0029d1616f3edb1e3a8db3.tar.gz
rails-2506e5c9a7d251680f0029d1616f3edb1e3a8db3.tar.bz2
rails-2506e5c9a7d251680f0029d1616f3edb1e3a8db3.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/cgi_ext')
-rw-r--r--actionpack/lib/action_controller/cgi_ext/cookie.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cookie.rb b/actionpack/lib/action_controller/cgi_ext/cookie.rb
index ef033fb4f3..009ddd1c64 100644
--- a/actionpack/lib/action_controller/cgi_ext/cookie.rb
+++ b/actionpack/lib/action_controller/cgi_ext/cookie.rb
@@ -78,6 +78,12 @@ class CGI #:nodoc:
buf
end
+ # FIXME: work around broken 1.8.7 DelegateClass#respond_to?
+ def respond_to?(method, include_private = false)
+ return true if super(method)
+ return __getobj__.respond_to?(method, include_private)
+ end
+
# Parses a raw cookie string into a hash of <tt>cookie-name => cookie-object</tt>
# pairs.
#