kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Fixed that proxy IPs do not follow all RFC1918 nets #251 [caleb@aei-tech.com] 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@789 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-02-24 12:03:17 +00:00
parent 4fbc3e30eb
commit 11404e17e3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* Fixed that proxy IPs do not follow all RFC1918 nets #251 [caleb@aei-tech.com]
* Added Base#render_to_string to parse a template and get the result back as a string #479
* Fixed that send_file/data can work even if render* has been called before in action processing to render the content of a file to be send for example #601

2
actionpack/lib/action_controller/request.rb
View File

@ -43,7 +43,7 @@ module ActionController
if env.include? 'HTTP_X_FORWARDED_FOR' then
remote_ips = env['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip|
ip =~ /^unknown$|^(10|172\.16|192\.168)\./i
ip =~ /^unknown$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i
end
return remote_ips.first.strip unless remote_ips.empty?