[Jifty-commit] jifty branch, master, updated. 1.10518-146-g113f5e2

Jifty commits jifty-commit at lists.jifty.org
Mon Nov 25 15:59:03 EST 2013


The branch, master has been updated
       via  113f5e2f2044d8b05f7e496695fd19ae2ac40084 (commit)
      from  9f66bac127c3704b53022f8f54b718d790f31add (commit)

Summary of changes:
 lib/Jifty/Dispatcher.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 113f5e2f2044d8b05f7e496695fd19ae2ac40084
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Nov 25 15:58:57 2013 -0500

    Ensure that the current path is not interpreted as a regex

diff --git a/lib/Jifty/Dispatcher.pm b/lib/Jifty/Dispatcher.pm
index e71dd92..4f6a7af 100644
--- a/lib/Jifty/Dispatcher.pm
+++ b/lib/Jifty/Dispatcher.pm
@@ -1058,11 +1058,11 @@ sub _compile_condition {
         } elsif ( length($compiled) ) {
 
             # 'foo' => qr{^$cwd/foo}
-            $compiled = "(?<=\\A$self->{cwd}/)$compiled";
+            $compiled = "(?<=\\A\Q$self->{cwd}\E/)$compiled";
         } else {
 
             # empty path -- just match $cwd itself
-            $compiled = "(?<=\\A$self->{cwd})";
+            $compiled = "(?<=\\A\Q$self->{cwd}\E)";
         }
 
         if ( $Dispatcher->{rule} eq 'on' ) {

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list