diff options
author | Christopher Jones <sixd@php.net> | 2012-11-15 19:29:44 -0800 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2012-11-15 19:29:44 -0800 |
commit | 16f9f4693544ac61f480d0cfce6aaca98807fd5d (patch) | |
tree | fb2750e31f7ca914c7179e93b279c4d29b7ac8b9 | |
parent | 019bdff3951f415e2d5c44933da30a4669c628e8 (diff) | |
parent | 7468fc0e374ad8cd8db482e6c228cdaae8aed075 (diff) | |
download | php-git-16f9f4693544ac61f480d0cfce6aaca98807fd5d.tar.gz |
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
Skip test if directory does not exist
Updated NEWS
-rw-r--r-- | NEWS | 3 | ||||
-rwxr-xr-x | UPGRADING | 2 | ||||
-rw-r--r-- | tests/security/open_basedir_001.phpt | 3 |
3 files changed, 8 insertions, 0 deletions
@@ -5,6 +5,9 @@ PHP NEWS - Core: . Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created). (kemcline at au1 dot ibm dot com) +- Apache2 Handler SAPI: + . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) + ?? ??? 2012, PHP 5.3.19 @@ -484,6 +484,8 @@ UPGRADE NOTES - PHP 5.3 must be activated manually with the "extension = php_com_dotnet.dll" directive in php.ini. +- Apache 2.4 handler is supported as of PHP 5.3.20 + ===================== 11.1 New in PHP 5.3.4 ===================== diff --git a/tests/security/open_basedir_001.phpt b/tests/security/open_basedir_001.phpt index e05861a81d..9ea9559942 100644 --- a/tests/security/open_basedir_001.phpt +++ b/tests/security/open_basedir_001.phpt @@ -5,6 +5,9 @@ openbase_dir runtime tightning if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. only for unix'); } +if (!is_dir("/usr/local/bin")) { + die('skip.. no /usr/local/bin on this machine'); +} --INI-- open_basedir=/usr/local --FILE-- |