From: Christopher Schmidt <crschmidt@crschmidt.net>
Date: Sun, 11 May 2008 23:12:54 +0000 (+0000)
Subject: make error_message spit out the message text to the user as well as
X-Git-Tag: live~7557^2~346
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/322f3d7576c325e1726db9561dd1a96dd5632cbb?hp=97cb1fd7fa2916974538fde2a6ea311a3f793989

make error_message spit out the message text to the user as well as
putting it in the header.
---

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index acb2f9162..8d082c2ca 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -61,7 +61,7 @@ class ApplicationController < ActionController::Base
   #  phrase from that, we can also put the error message into the status
   #  message. For now, rails won't let us)
   def report_error(message)
-    render :nothing => true, :status => :bad_request
+    render :text => message, :status => :bad_request
     # Todo: some sort of escaping of problem characters in the message
     response.headers['Error'] = message
   end
@@ -72,6 +72,8 @@ private
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
       authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 
+    elsif request.env.has_key? 'REDIRECT_X_HTTP_AUTHORIZATION'          # mod_fcgi 
+      authdata = request.env['REDIRECT_X_HTTP_AUTHORIZATION'].to_s.split 
     elsif request.env.has_key? 'HTTP_AUTHORIZATION'         # regular location
       authdata = request.env['HTTP_AUTHORIZATION'].to_s.split
     end