Fixed bug#46681 (mkdir() fails silently on PHP 5.3)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 2c3ba6e8fe8b416b736e8c460f37c37d1a5507bd..abbed9db3d42fc120a705ab2a3b752510898e6ed 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1498,7 +1498,7 @@ PHPAPI int php_mkdir_ex(char *dir, long mode, int options TSRMLS_DC)
                return -1;
        }
 
-       if ((ret = VCWD_MKDIR(dir, (mode_t)mode)) < 0 && (options & REPORT_ERRORS) == 1) {
+       if ((ret = VCWD_MKDIR(dir, (mode_t)mode)) < 0 && (options & REPORT_ERRORS)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
        }
 

diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
index 54977b1b47094c985ba6d663b7d273d8dfe2df7a..5497fd1ac679001577d7a22f6ee28ec1a18fa789 100644 (file)
--- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
@@ -70,6 +70,8 @@ bool(true)
 
 *** Testing mkdir() with miscelleneous input ***
 bool(true)
+
+Warning: mkdir(): Permission denied in %sfile/mkdir_rmdir_variation2.php on line %d
 bool(false)
 bool(true)
 Done

diff --git a/ext/standard/tests/file/mkdir_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt
index 507a97b4ee2291a84a0aacd5050a57000b3201d3..6dfe3be62a6f22ce0739887f5f56a5d3f38c5730 100644 (file)
--- a/ext/standard/tests/file/mkdir_variation1-win32.phpt
+++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt
@@ -2,7 +2,6 @@
 Test mkdir() function : usage variation: try invalid pathname
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
---XFAIL--
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
@@ -120,4 +119,4 @@ Error: 2 - mkdir(): No such file or directory, %s(%d)
 
 --single space--
 Error: 2 - mkdir(): %s, %s(%d)
-===DONE===
\ No newline at end of file
+===DONE===

diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt
index e8c500661c1e8f423dd59d0b56204bedf4354df7..2edb3c37b9b34fdfb2e75d572817e15e6961d1ef 100644 (file)
--- a/ext/standard/tests/file/mkdir_variation1.phpt
+++ b/ext/standard/tests/file/mkdir_variation1.phpt
@@ -2,7 +2,6 @@
 Test mkdir() function : usage variation: try invalid pathname 
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
---XFAIL--
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
@@ -119,4 +118,4 @@ Error: 2 - mkdir(): No such file or directory, %s(%d)
 
 --single space--
 directory created
-===DONE===
\ No newline at end of file
+===DONE===

diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt
index 51fb8260c12980ff104a9d70cf23fe161291db75..8a02fe1d6765ed3329d8303e226f0ec3968adf34 100644 (file)
--- a/ext/standard/tests/file/mkdir_variation5.phpt
+++ b/ext/standard/tests/file/mkdir_variation5.phpt
@@ -2,7 +2,6 @@
 Test mkdir() function : variation: various valid and invalid paths 
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
---XFAIL--
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")