diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-02-15 22:06:17 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-02-15 22:06:17 +0530 |
| commit | 0c145448c42e811f9241e1634ecd2d60ddefff3a (patch) | |
| tree | fb56c9870510de868250c4e027a11ebcead6e53f /actionpack/lib/action_dispatch | |
| parent | 520a16caad3d89da734c0f5bc14b8c16090f891f (diff) | |
| parent | 2008fe606b6096e4b8ad9c03e03b0d11b94605cd (diff) | |
| download | rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.tar.gz rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.tar.bz2 rails-0c145448c42e811f9241e1634ecd2d60ddefff3a.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/upgrading_ruby_on_rails.md
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/remote_ip.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb index 4e36c9bb49..5b5fa2a0e2 100644 --- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb +++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb @@ -2,7 +2,7 @@ module ActionDispatch # This middleware calculates the IP address of the remote client that is # making the request. It does this by checking various headers that could # contain the address, and then picking the last-set address that is not - # on the list of trusted IPs. This follows the precendent set by e.g. + # on the list of trusted IPs. This follows the precedent set by e.g. # {the Tomcat server}[https://issues.apache.org/bugzilla/show_bug.cgi?id=50453], # with {reasoning explained at length}[http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection] # by @gingerlime. A more detailed explanation of the algorithm is given |