diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2014-07-18 13:27:43 -0400 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2014-07-18 13:27:43 -0400 |
| commit | 86433b8d5f1a7d28e0bb6ceeaf824e67acf4b759 (patch) | |
| tree | 3e30811477b1a74445772bf03b846b70f85d389b /actionpack | |
| parent | 9ff18e4626ceb3e50b81b2966d304d02160b619e (diff) | |
| download | rails-86433b8d5f1a7d28e0bb6ceeaf824e67acf4b759.tar.gz rails-86433b8d5f1a7d28e0bb6ceeaf824e67acf4b759.tar.bz2 rails-86433b8d5f1a7d28e0bb6ceeaf824e67acf4b759.zip | |
Add CHANGELOG for #14886
Also cleanup test a bit
[related #14886]
[related #14743]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index f73f5bc797..c30217b8fe 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,8 @@ +* Allows ActionDispatch::Request::LOCALHOST to match any IPv4 127.0.0.0/8 + loopback address. + + *Earl St Sauver*, *Sven Riedel* + * Preserve original path in `ShowExceptions` middleware by stashing it as `env["action_dispatch.original_path"]` diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index beae95f3fd..2763bd661f 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -531,7 +531,7 @@ end class LocalhostTest < BaseRequestTest test "IPs that match localhost" do request = stub_request("REMOTE_IP" => "127.1.1.1", "REMOTE_ADDR" => "127.1.1.1") - assert_equal !!request.local?, true + assert request.local? end end |