From 322f3d7576c325e1726db9561dd1a96dd5632cbb Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Sun, 11 May 2008 23:12:54 +0000 Subject: [PATCH] make error_message spit out the message text to the user as well as putting it in the header. --- app/controllers/application.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.43.2