diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
| commit | 751f79a03351f1f0d21436b2b947352b97ded093 (patch) | |
| tree | 9dd053597389241398c9173ab7f565697bef055f /actionpack/lib/action_dispatch/middleware/show_exceptions.rb | |
| parent | e7e6ee3e7b075f5447697a6038cb46d65f9b137a (diff) | |
| parent | ab2877cbe89e266ee986fc12e603abd93ac017ad (diff) | |
| download | rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.gz rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.bz2 rails-751f79a03351f1f0d21436b2b947352b97ded093.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/show_exceptions.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index f9e81a02d3..8a2d8cd077 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -6,7 +6,7 @@ module ActionDispatch # This middleware rescues any exception returned by the application and renders # nice exception pages if it's being rescued locally. class ShowExceptions - LOCALHOST = ['127.0.0.1', '::1'].freeze + LOCALHOST = [/^127\.0\.0\.\d{1,3}$/, "::1", /^0:0:0:0:0:0:0:1(%.*)?$/].freeze RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates') @@ -114,7 +114,7 @@ module ActionDispatch # True if the request came from localhost, 127.0.0.1. def local_request?(request) - LOCALHOST.any?{ |local_ip| request.remote_addr == local_ip && request.remote_ip == local_ip } + LOCALHOST.any? { |local_ip| local_ip === request.remote_addr && local_ip === request.remote_ip } end def status_code(exception) |