diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-02-18 10:30:39 +0000 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-02-18 10:30:39 +0000 |
| commit | 29820a6daa38e5becd3d8ba28aab5eede513e7a1 (patch) | |
| tree | 6d31ae2e59b9b7a2ad48179dbb8df6cd07399f14 | |
| parent | d4bdb6e2b254fa32a22af68b8a284ac79780038c (diff) | |
Not using fcgi - get rid of monkey patches
| -rw-r--r-- | config/environment.rb | 1 | ||||
| -rw-r--r-- | lib/fcgi_fixes.rb | 10 | ||||
| -rw-r--r-- | spec/lib/fcgi_fixes_spec.rb | 14 |
3 files changed, 0 insertions, 25 deletions
diff --git a/config/environment.rb b/config/environment.rb index c4351dbd1..8a8ee91e3 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -110,7 +110,6 @@ require 'tmail_extensions.rb' require 'activesupport_cache_extensions.rb' require 'public_body_categories.rb' require 'timezone_fixes.rb' -require 'fcgi_fixes.rb' require 'use_spans_for_errors.rb' require 'make_html_4_compliant.rb' require 'activerecord_errors_extensions.rb' diff --git a/lib/fcgi_fixes.rb b/lib/fcgi_fixes.rb deleted file mode 100644 index 387995a90..000000000 --- a/lib/fcgi_fixes.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Changed by mySociety 2008-03-10 to get dynamic FastCGI working. -# See also http://dev.rubyonrails.org/ticket/5399 - gah! - -# Hopefully fixed in later Rails. There is a test in spec/libs/fcgi_handler.rb - -require 'railties/lib/fcgi_handler.rb' - -# Monkeypatch! -RailsFCGIHandler::SIGNALS['TERM'] = :exit - diff --git a/spec/lib/fcgi_fixes_spec.rb b/spec/lib/fcgi_fixes_spec.rb deleted file mode 100644 index edc1c9d98..000000000 --- a/spec/lib/fcgi_fixes_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -# This is a test of the monkey patches in lib/fcgi_fixes.rb - -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') - -require 'railties/lib/fcgi_handler.rb' - -describe "when doing FastCGI" do - - it "should have fixed dynamic FastCGI bug" do - RailsFCGIHandler::SIGNALS['TERM'].should == :exit - end - -end - |