aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2015-09-03 04:37:10 -0400
committerEileen M. Uchitelle <eileencodes@gmail.com>2015-09-03 04:37:10 -0400
commit0294c61359340892f0c38f57b203ba58edbc55e5 (patch)
treed5a732094a95c7d4dee1dfdf4131b4ca57690aa4 /actionpack/lib
parent43dd11853984055f8c0ac330df88b92942f0c89b (diff)
parent9567ba737f6fb8c4e16fed471ec52bf58c2bbe13 (diff)
downloadrails-0294c61359340892f0c38f57b203ba58edbc55e5.tar.gz
rails-0294c61359340892f0c38f57b203ba58edbc55e5.tar.bz2
rails-0294c61359340892f0c38f57b203ba58edbc55e5.zip
Merge pull request #21483 from justanshulsharma/add-ip6-address
[ci skip] Added localhost IPv6
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 45600d0a61..df621f1074 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -362,7 +362,7 @@ module ActionDispatch
get_header('REDIRECT_X_HTTP_AUTHORIZATION')
end
- # True if the request came from localhost, 127.0.0.1.
+ # True if the request came from localhost, 127.0.0.1, or ::1.
def local?
LOCALHOST =~ remote_addr && LOCALHOST =~ remote_ip
end