aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-18 13:02:25 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-18 13:02:25 -0300
commit67e57ea7c0032815aef4cd9c02792c9badf90abe (patch)
tree65cd3b74f6d12360bfa14cbeb1473295e6018327
parent68345d4a1a6c9251826cb0a43182f6d934c5c822 (diff)
parent4e84e12a8e54208b4ab0ce93f1477d6478949899 (diff)
downloadrails-67e57ea7c0032815aef4cd9c02792c9badf90abe.tar.gz
rails-67e57ea7c0032815aef4cd9c02792c9badf90abe.tar.bz2
rails-67e57ea7c0032815aef4cd9c02792c9badf90abe.zip
Merge pull request #14094 from kalabiyau/fix_parameters_naming
Fix parameter naming in RemoteIp middleware constructor method [ci skip]
-rw-r--r--actionpack/lib/action_dispatch/middleware/remote_ip.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 57bc6d5cd0..c1df518b14 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -47,12 +47,12 @@ module ActionDispatch
# clients (like WAP devices), or behind proxies that set headers in an
# incorrect or confusing way (like AWS ELB).
#
- # The +custom_trusted+ argument can take a regex, which will be used
+ # The +custom_proxies+ argument can take a regex, which will be used
# instead of +TRUSTED_PROXIES+, or a string, which will be used in addition
# to +TRUSTED_PROXIES+. Any proxy setup will put the value you want in the
# middle (or at the beginning) of the X-Forwarded-For list, with your proxy
# servers after it. If your proxies aren't removed, pass them in via the
- # +custom_trusted+ parameter. That way, the middleware will ignore those
+ # +custom_proxies+ parameter. That way, the middleware will ignore those
# IP addresses, and return the one that you want.
def initialize(app, check_ip_spoofing = true, custom_proxies = nil)
@app = app