diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-05-24 12:06:53 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-05-24 12:06:53 +0200 |
| commit | 0b297a17e849f2068b4caa2a54dd8513a0b9b3ba (patch) | |
| tree | 7f2f34dabdbef7a7c8cf88f53634a93135360327 /ext/phar/tests | |
| parent | d4fd95e292d20c0ff256269bfb96abdc56fd7a17 (diff) | |
| parent | b5511dcfd756628430dc447127d0d90a09e36dfc (diff) | |
| download | php-git-0b297a17e849f2068b4caa2a54dd8513a0b9b3ba.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails
Diffstat (limited to 'ext/phar/tests')
| -rw-r--r-- | ext/phar/tests/fatal_error_webphar.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/tests/fatal_error_webphar.phpt b/ext/phar/tests/fatal_error_webphar.phpt index 3153c344e0..dd6e0961a9 100644 --- a/ext/phar/tests/fatal_error_webphar.phpt +++ b/ext/phar/tests/fatal_error_webphar.phpt @@ -15,4 +15,4 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- string(9) "\Web\View" -Parse error: syntax error, unexpected %s, expecting %s in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 +Parse error: syntax error, unexpected %s, expecting %s in phar://%r([A-Za-z]:)?%r/%sfatal_error_webphar.php/Web/View.php on line 380 |