Merge branch 'hotfix/zf2-533' into develop

Forward port #2383
zendframework · Sep 21, 2012 · eaacea4 · eaacea4
2 parents 98b04b6 + 44ae7cd
commit eaacea4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/Uri/Uri.php b/library/Zend/Uri/Uri.php
@@ -24,7 +24,7 @@ class Uri implements UriInterface
     /**
      * Character classes defined in RFC-3986
      */
-    const CHAR_UNRESERVED = '\w\-\.~';
+    const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
     const CHAR_GEN_DELIMS = ':\/\?#\[\]@';
     const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
     const CHAR_RESERVED   = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';

diff --git a/tests/run-tests.php b/tests/run-tests.php
@@ -86,7 +86,7 @@
     foreach ($components as $component) {
         $component =   'ZendTest/' . basename(str_replace('_', '/', $component));
         echo "$component:\n";
-        system("$phpunit_bin $phpunit_opts $phpunit_coverage " . __DIR__ . '/' . $component, $c_result);
+        system("$phpunit_bin $phpunit_opts $phpunit_coverage " . escapeshellarg(__DIR__ . '/' . $component), $c_result);
         echo "\n\n";
         if ($c_result) {
             $result = $c_result;