diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-13 16:51:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-13 16:54:53 +0200 |
| commit | f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a (patch) | |
| tree | ad8597fe53119f9eb1daac0df4e554d3c7861c21 /tests/lang | |
| parent | 268740d9848d435054ce73a8cfe36b2b732cd1f7 (diff) | |
| parent | 80d5ae3cea4c6fdd85789edfde0e2da721a0741b (diff) | |
| download | php-git-f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
Diffstat (limited to 'tests/lang')
| -rw-r--r-- | tests/lang/bug45392.phpt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt index ae84cd9d1d..78876c7c80 100644 --- a/tests/lang/bug45392.phpt +++ b/tests/lang/bug45392.phpt @@ -2,6 +2,11 @@ Bug #45392 (ob_start()/ob_end_clean() and memory_limit) --INI-- display_errors=stderr +--SKIPIF-- +<?php +if (getenv("USE_ZEND_ALLOC") === "0") { + die("skip Zend MM disabled"); +} --FILE-- <?php echo __LINE__ . "\n"; |