com php-src: Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6: ext/opcache/tests/bug68104.phpt
| From: | Xinchen Hui | Date: | Fri, 31 Oct 2014 09:36:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6: ext/opcache/tests/bug68104.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82912@lists.php.net to get a copy of this message | ||
Commit: d017c4bf3ae8c49340b56f9ab1d31d2793f65489
Author: Xinchen Hui <laruence@php.net> Fri, 31 Oct 2014 17:35:19 +0800
Parents: d9d181e5ad41128a97a6e01d14fb766ff7bf31a8 113f1fd6d5eb286c50f6cca003d18f847bc202cb
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d017c4bf3ae8c49340b56f9ab1d31d2793f65489
Log:
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into
PHP-5.6
Changed paths:
MA ext/opcache/tests/bug68104.phpt
Diff:
diff --cc ext/opcache/tests/bug68104.phpt
index 521486e,0000000..89439ef
mode 100644,000000..100644
--- a/ext/opcache/tests/bug68104.phpt
+++ b/ext/opcache/tests/bug68104.phpt
@@@ -1,13 -1,0 +1,17 @@@
+--TEST--
+Bug #68104 (Segfault while pre-evaluating a disabled function)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+disable_functions=dl
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+var_dump(is_callable("dl"));
- --EXPECT--
++dl("a.so");
++?>
++--EXPECTF--
+bool(true)
++
++Warning: dl() has been disabled for security reasons in %sbug68104.php on line %d