Merge branch 'develop' of github.com:framework-one/fw1 into develop

framework-one · May 15, 2015 · fe93baf · fe93baf
2 parents 57702e5 + 6012922
commit fe93baf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framework/one.cfc b/framework/one.cfc
@@ -1752,7 +1752,7 @@ component {
             if ( !len( routeRegEx.target ) || right( routeRegEx.target, 1) != '/' ) routeRegEx.target &= '/';
             // walk for self defined (regex) and :var -  replace :var with ([^/]*) in route and back reference in target:
             var n = 1;
-            var placeholders = rematch( '(:[^/]+)|(\([^\)]+)', routeRegEx.pattern );
+            var placeholders = rematch( '(:[-_a-zA-Z0-9]+)|(\([^\)]+)', routeRegEx.pattern );
             for ( var placeholder in placeholders ) {
                 if ( left( placeholder, 1 ) == ':') {
                     routeRegEx.pattern = replace( routeRegEx.pattern, placeholder, '([^/]*)' );
@@ -1908,7 +1908,7 @@ component {
         var omitIndex = false;
         var optionalOmit = false;
         if ( path == 'useCgiScriptName' ) {
-            path = request._fw1.cgiScriptName;
+            path = getContextRoot() & request._fw1.cgiScriptName;
             optionalOmit = true;
         } else if ( path == 'useRequestURI' ) {
             path = getPageContext().getRequest().getRequestURI();