Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Avoid memleak in dev mode with fastcgi

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2584 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit e2fc88eef49af4ca8e35ae78ce3221c947e168c7 1 parent 86455d3
@jamis jamis authored
Showing with 11 additions and 4 deletions.
  1. +3 −1 activerecord/CHANGELOG
  2. +8 −3 activerecord/lib/active_record/base.rb
View
4 activerecord/CHANGELOG
@@ -1,4 +1,6 @@
-*SVN*
+*SVN*
+
+* Avoid memleak in dev mode when using fcgi
* Simplified .clear on active record associations by using the existing delete_records method. #1906 [Caleb <me@cpb.ca>]
View
11 activerecord/lib/active_record/base.rb
@@ -940,9 +940,14 @@ def attribute_condition(argument)
# end
def define_attr_method(name, value=nil, &block)
sing = class << self; self; end
- block = proc { value.to_s } if value
- sing.send( :alias_method, "original_#{name}", name )
- sing.send( :define_method, name, &block )
+ sing.send :alias_method, "original_#{name}", name
+ if value
+ # use eval instead of a block to work around a memory leak in dev
+ # mode in fcgi
+ sing.class_eval "def #{name}; #{value.to_s.inspect}; end"
+ else
+ sing.send :define_method, name, &block
+ end
end
protected
Please sign in to comment.
Something went wrong with that request. Please try again.