summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-09-28 13:41:06 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-09-28 13:41:06 +0200
commit99eb4b2ea47dbde9edd329da74366698c13f1cb9 (patch)
tree081ef2626165abd9dfde7c7bbb56b6f0683b59d2 /Zend
parent1c35357b31a771029a882dc7d3de27de26af37be (diff)
parentfa84b8ebb4ab14ca841d7e479865548dadc5eb88 (diff)
downloadphp-git-99eb4b2ea47dbde9edd329da74366698c13f1cb9.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'Zend')
-rw-r--r--Zend/tests/bug76846.phpt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/tests/bug76846.phpt b/Zend/tests/bug76846.phpt
index c167a8bb78..fbef201033 100644
--- a/Zend/tests/bug76846.phpt
+++ b/Zend/tests/bug76846.phpt
@@ -23,5 +23,4 @@ while (true) {
?>
--EXPECTF--
-Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %s on line %d
-%A
+Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d%A