diff options
author | Xinchen Hui <laruence@gmail.com> | 2013-12-15 16:51:32 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2013-12-15 16:51:32 +0800 |
commit | 10964b78548a5878254f5aa75f4cfdcedb0543bc (patch) | |
tree | 3b66060599ba18609c8bccd659b334072c319454 /Zend/tests | |
parent | 509a67d28f792a2a11f86a3aca4a5ac820d2f747 (diff) | |
parent | 330168a2477666212797095449029e78dcce0844 (diff) | |
download | php-git-10964b78548a5878254f5aa75f4cfdcedb0543bc.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'Zend/tests')
-rw-r--r-- | Zend/tests/bug41421.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/tests/bug41421.phpt b/Zend/tests/bug41421.phpt index f10db10980..f39fb15dda 100644 --- a/Zend/tests/bug41421.phpt +++ b/Zend/tests/bug41421.phpt @@ -24,6 +24,6 @@ Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on l Fatal error: Uncaught exception 'Exception' in %s:%d Stack trace: #0 [internal function]: wrapper->stream_eof() -#1 %s(%d): feof(Resource id #6) +#1 %s(%d): feof(Resource id #%d) #2 {main} thrown in %s on line %d |