diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-08 20:09:30 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-08 20:11:05 +0200 |
| commit | 68b4720fd18796f337000f37bf57af905b0370a7 (patch) | |
| tree | 6646655fc82b6a9312df4854557ad7df7c20c6fa /actionpack | |
| parent | 068f8d6e85aa0c54bd4531c0e9ef15804b0444de (diff) | |
| download | rails-68b4720fd18796f337000f37bf57af905b0370a7.tar.gz rails-68b4720fd18796f337000f37bf57af905b0370a7.tar.bz2 rails-68b4720fd18796f337000f37bf57af905b0370a7.zip | |
Accept both regexps and strings for LOCALHOST.
Diffstat (limited to 'actionpack')
| -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 b32e7be31f..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\.\d{1,3}$/, /^::1$/, /^0:0:0:0:0:0:0: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) |