From effa82043b966eb37660dfa1e273c7e7bddf150b Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Fri, 12 Dec 2008 12:40:58 +0000 Subject: [PATCH] Fixed bug#46681 (mkdir() fails silently on PHP 5.3) --- ext/standard/file.c | 2 +- ext/standard/tests/file/mkdir_rmdir_variation2.phpt | 2 ++ ext/standard/tests/file/mkdir_variation1-win32.phpt | 3 +-- ext/standard/tests/file/mkdir_variation1.phpt | 3 +-- ext/standard/tests/file/mkdir_variation5.phpt | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ext/standard/file.c b/ext/standard/file.c index 2c3ba6e8fe..abbed9db3d 100644 --- 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 54977b1b47..5497fd1ac6 100644 --- 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 507a97b4ee..6dfe3be62a 100644 --- 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 ---XFAIL-- --SKIPIF-- ---XFAIL-- --SKIPIF-- ---XFAIL-- --SKIPIF--