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

3 files changed, 8 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 26b179db30..bca9590678 100644
--- a/NEWS
+++ b/NEWS
@@ -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
 
diff --git a/UPGRADING b/UPGRADING
index 9d62054bd6..bccae6631d 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -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--