Permalink
Browse files

Merge branch 'hotfix/zf2-533' into develop

Forward port #2383
  • Loading branch information...
2 parents 4aa335a + 97da77c commit de6cc223923a1399d302ff8d2b31b7822fabc5a8 @weierophinney weierophinney committed Sep 21, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 library/Zend/Uri/Uri.php
  2. +1 −1 tests/run-tests.php
View
@@ -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 = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';
View
@@ -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;

0 comments on commit de6cc22

Please sign in to comment.