diff options
| author | Christopher Jones <sixd@php.net> | 2012-05-01 14:47:18 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-05-01 14:47:18 -0700 |
| commit | f2e81779a70a7202df38084bbcb4f0a81397cbda (patch) | |
| tree | 3d0905c85f709515880977a777b72ee5399d1ba5 | |
| parent | 1c2c620a583ac9df213e57839aae2a7a7307b42e (diff) | |
| parent | cac09f333384463613d1a27e79f9c7fa949f87db (diff) | |
| download | php-git-f2e81779a70a7202df38084bbcb4f0a81397cbda.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix masking in bug61115-1.phpt
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
| -rw-r--r-- | ext/standard/tests/streams/bug61115-1.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 573496edf0..89374e7353 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp); ftruncate($fileResourceTemp, PHP_INT_MAX); ?> --EXPECTF-- -Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d +Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d |