aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-31 12:10:44 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-31 12:10:44 -0800
commite072f828af01ee4e613a02b8b4d0d3348eb7b902 (patch)
treeb6db04b3fb6fbca82cdd533f1bb0c445bb573bdc /actionpack/lib/action_controller
parentadb8fea4936070af5a531089af25517deb4bd77c (diff)
parentbaa240d09c09b74e9bc69c91e4b5c9fb5bca2005 (diff)
downloadrails-e072f828af01ee4e613a02b8b4d0d3348eb7b902.tar.gz
rails-e072f828af01ee4e613a02b8b4d0d3348eb7b902.tar.bz2
rails-e072f828af01ee4e613a02b8b4d0d3348eb7b902.zip
Merge pull request #9133 from homakov/patch-6
Use \A in Regexps
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/redirecting.rb2
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 59b91a240e..e9031f3fac 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -88,7 +88,7 @@ module ActionController
# letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
# characters; and is terminated by a colon (":").
# The protocol relative scheme starts with a double slash "//"
- when %r{^(\w[\w+.-]*:|//).*}
+ when %r{\A(\w[\w+.-]*:|//).*}
options
when String
request.protocol + request.host_with_port + options