aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware
diff options
context:
space:
mode:
authorKalabiYau <skullzeek@gmail.com>2014-02-18 15:52:56 +0100
committerKalabiYau <skullzeek@gmail.com>2014-02-18 15:52:56 +0100
commit4e84e12a8e54208b4ab0ce93f1477d6478949899 (patch)
tree90e3aa86d1cfc51fe7db57be065e4a1bad5d469d /actionpack/lib/action_dispatch/middleware
parent5d037819ca80606638212f83de741cc2041db28f (diff)
downloadrails-4e84e12a8e54208b4ab0ce93f1477d6478949899.tar.gz
rails-4e84e12a8e54208b4ab0ce93f1477d6478949899.tar.bz2
rails-4e84e12a8e54208b4ab0ce93f1477d6478949899.zip
Fix parameter naming in RemoteIp middleware constructor method
Was custom_proxies in inline docs, but should be and defined in constructor as custom_proxies
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-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