aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/fcgi_handler.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-02-07 00:35:15 -0600
committerJoshua Peek <josh@joshpeek.com>2009-02-07 00:35:15 -0600
commitf98d8ee72b2fd92bf0e09f3cade60add9efd3a15 (patch)
tree9d2e9b09d08d5a003a044c15975be38e7febba0f /railties/lib/fcgi_handler.rb
parent2316e7dfb16518d4d0d92165bcd53b262080fc37 (diff)
downloadrails-f98d8ee72b2fd92bf0e09f3cade60add9efd3a15.tar.gz
rails-f98d8ee72b2fd92bf0e09f3cade60add9efd3a15.tar.bz2
rails-f98d8ee72b2fd92bf0e09f3cade60add9efd3a15.zip
Fix up failing tests broke by 2316e7d
Diffstat (limited to 'railties/lib/fcgi_handler.rb')
-rw-r--r--railties/lib/fcgi_handler.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/fcgi_handler.rb
index 9e508cbcc2..0cd2dc51c6 100644
--- a/railties/lib/fcgi_handler.rb
+++ b/railties/lib/fcgi_handler.rb
@@ -71,7 +71,7 @@ class RailsFCGIHandler
protected
def process_each_request(provider)
- cgi = nil
+ request = nil
catch :exit do
provider.each do |request|
@@ -81,17 +81,17 @@ class RailsFCGIHandler
when :reload
reload!
when :restart
- close_connection(cgi)
+ close_connection(request)
restart!
when :exit
- close_connection(cgi)
+ close_connection(request)
throw :exit
end
end
end
rescue SignalException => signal
raise unless signal.message == 'SIGUSR1'
- close_connection(cgi)
+ close_connection(request)
end
def process_request(request)
@@ -233,7 +233,7 @@ class RailsFCGIHandler
end
end
- def close_connection(cgi)
- cgi.instance_variable_get("@request").finish if cgi
+ def close_connection(request)
+ request.finish if request
end
end