diff options
| author | wycats <wycats@gmail.com> | 2010-03-17 00:15:55 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-17 00:20:09 -0700 |
| commit | a5587efc1903fd27d4b179753aa6e139445ad18c (patch) | |
| tree | 7642d070d3f876e4c11b7aea3cded9ec2ffd2d79 /actionpack/lib/action_controller/metal | |
| parent | cd9ffd11e13ef6e62eba2cbd5c3760ff04132820 (diff) | |
| download | rails-a5587efc1903fd27d4b179753aa6e139445ad18c.tar.gz rails-a5587efc1903fd27d4b179753aa6e139445ad18c.tar.bz2 rails-a5587efc1903fd27d4b179753aa6e139445ad18c.zip | |
Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM warnings are in dependencies.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/redirecting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index 25e4e18493..b5f1d23ef0 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -76,7 +76,7 @@ module ActionController # The scheme name consist of a letter followed by any combination of # letters, digits, and the plus ("+"), period ("."), or hyphen ("-") # characters; and is terminated by a colon (":"). - when %r{^\w[\w\d+.-]*:.*} + when %r{^\w[\w+.-]*:.*} options when String request.protocol + request.host_with_port + options |