Abort any existing load before starting a new one

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a0e0e20dcf44b0e8405ab5fc24de275079e74f47..4b2c7082558c22eee5fe0ad4c8532c210744db89 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
 
   protect_from_forgery
 

+  before_filter :fetch_body
+

   if STATUS == :database_readonly or STATUS == :database_offline
     def self.cache_sweeper(*sweepers)
     end
   if STATUS == :database_readonly or STATUS == :database_offline
     def self.cache_sweeper(*sweepers)
     end


@@ -243,7 +245,7 @@ class ApplicationController < ActionController::Base
 
       render :text => result.to_s, :content_type => "text/xml"
     else
 
       render :text => result.to_s, :content_type => "text/xml"
     else

-      render :text => message + "\n", :status => status
+      render :text => message, :status => status

     end
   end
   
     end
   end
   


@@ -404,7 +406,20 @@ class ApplicationController < ActionController::Base
       format.all { render :nothing => true, :status => :not_found }
     end
   end
       format.all { render :nothing => true, :status => :not_found }
     end
   end

-  
+
+  ##
+  # Unfortunately if a PUT or POST request that has a body fails to
+  # read it then Apache will sometimes fail to return the response it
+  # is given to the client properly, instead erroring:
+  #
+  #   https://issues.apache.org/bugzilla/show_bug.cgi?id=44782
+  #
+  # To work round this we call rewind on the body here, which is added
+  # as a filter, to force it to be fetched from Apache into a file.
+  def fetch_body
+    request.body.rewind
+  end
+

 private 
 
   # extract authorisation credentials from headers, returns user = nil if none
 private 
 
   # extract authorisation credentials from headers, returns user = nil if none