diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2015-06-14 18:53:11 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2015-06-14 18:53:11 -0500 |
| commit | 110e0a5a2cda3bfa7778bb871502ff2b50e59f76 (patch) | |
| tree | fa736924b4befce442cc72429b4e07812856c541 /ext/opcache/tests | |
| parent | 5c54bf015dc4fd930394709d80665d9a731f6f99 (diff) | |
| parent | 6cb7b48846d129f088b50c4a8c4b00b7dc886f5c (diff) | |
| download | php-git-110e0a5a2cda3bfa7778bb871502ff2b50e59f76.tar.gz | |
Merge branch 'master' into throwable-interface
# Conflicts:
# Zend/zend_language_scanner.c
# Zend/zend_language_scanner.l
# ext/simplexml/tests/SimpleXMLElement_xpath.phpt
Diffstat (limited to 'ext/opcache/tests')
| -rw-r--r-- | ext/opcache/tests/bug69688.phpt | 18 | ||||
| -rw-r--r-- | ext/opcache/tests/optimize_func_calls.phpt | 6 |
2 files changed, 23 insertions, 1 deletions
diff --git a/ext/opcache/tests/bug69688.phpt b/ext/opcache/tests/bug69688.phpt new file mode 100644 index 0000000000..cc75960e73 --- /dev/null +++ b/ext/opcache/tests/bug69688.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #69688 (segfault with eval and opcache fast shutdown) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.fast_shutdown=1 +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php +eval('function g() {} function g2() {} function g3() {}'); + +eval('class A{} class B{} class C{}'); + +?> +okey +--EXPECT-- +okey diff --git a/ext/opcache/tests/optimize_func_calls.phpt b/ext/opcache/tests/optimize_func_calls.phpt index b3bc8da6a9..3f795f5fc6 100644 --- a/ext/opcache/tests/optimize_func_calls.phpt +++ b/ext/opcache/tests/optimize_func_calls.phpt @@ -127,4 +127,8 @@ Array string(7) "changed" string(7) "changed" -Fatal error: Cannot pass parameter 1 by reference in %soptimize_func_calls.php on line %d +Fatal error: Uncaught EngineException: Cannot pass parameter 1 by reference in %soptimize_func_calls.php:%d +Stack trace: +#0 {main} + thrown in %soptimize_func_calls.php on line %d + |