From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Apr 2010 13:21:03 +0000 (+0000)
Subject: Don't send "408 Request timeout" responses from the data browser as it
X-Git-Tag: live~6343^2~13
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ae4ece24507c62494e63608c976863b50889b138?ds=sidebyside

Don't send "408 Request timeout" responses from the data browser as it
seems to make some browsers automatically retry.
---

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index a77b0f94a..a511d67d3 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -86,11 +86,11 @@ private
     end
   rescue ActionView::TemplateError => ex
     if ex.original_exception.is_a?(Timeout::Error)
-      render :action => "timeout", :status => :request_timeout
+      render :action => "timeout"
     else
       raise
     end
   rescue Timeout::Error
-    render :action => "timeout", :status => :request_timeout
+    render :action => "timeout"
   end
 end