diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-01 01:32:54 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-01 01:32:54 -0300 |
| commit | c47c1d206e87a6602300fc81d3094e1af01dc728 (patch) | |
| tree | 61b591c2ad41fc5ad8ac36e665e6f03a38bec621 /actionpack/lib/action_dispatch | |
| parent | 74b23b9e4be99f1735812b6e58e800f987c3a8a2 (diff) | |
| parent | c4a83b5454a3516b630b38cd8e8472f2166fc986 (diff) | |
| download | rails-c47c1d206e87a6602300fc81d3094e1af01dc728.tar.gz rails-c47c1d206e87a6602300fc81d3094e1af01dc728.tar.bz2 rails-c47c1d206e87a6602300fc81d3094e1af01dc728.zip | |
Merge pull request #19788 from cmdrclueless/actionpack_http_url_ipv6
Fix broken IPv6 addresses handling
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index e413954066..3e8e921b9b 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -5,7 +5,7 @@ module ActionDispatch module Http module URL IP_HOST_REGEXP = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ - HOST_REGEXP = /(^[^:]+:\/\/)?([^:]+)(?::(\d+$))?/ + HOST_REGEXP = /(^[^:]+:\/\/)?(\[[^\]]+\]|[^:]+)(?::(\d+$))?/ PROTOCOL_REGEXP = /^([^:]+)(:)?(\/\/)?$/ mattr_accessor :tld_length |