bjori Fri Dec 12 12:44:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard file.c
/php-src/ext/standard/tests/file mkdir_variation1.phpt
mkdir_variation1-win32.phpt
mkdir_variation5.phpt
mkdir_rmdir_variation2.phpt
Log:
MFH: Fixed bug#46681 (mkdir() fails silently on PHP 5.3)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.25&r2=1.409.2.6.2.28.2.26&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.25
php-src/ext/standard/file.c:1.409.2.6.2.28.2.26
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.25 Wed Nov 26 04:19:20 2008
+++ php-src/ext/standard/file.c Fri Dec 12 12:44:48 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.25 2008/11/26 04:19:20 lbarnaud Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.26 2008/12/12 12:44:48 bjori Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1355,7 +1355,7 @@
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));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/mkdir_variation1.phpt
diff -u php-src/ext/standard/tests/file/mkdir_variation1.phpt:1.1.4.2
php-src/ext/standard/tests/file/mkdir_variation1.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/mkdir_variation1.phpt:1.1.4.2 Wed Nov
26 10:10:17 2008
+++ php-src/ext/standard/tests/file/mkdir_variation1.phpt Fri Dec 12
12:44:48 2008
@@ -2,7 +2,6 @@
Test mkdir() function : usage variation: try invalid pathname
--CREDITS--
Dave Kelsey <d_kel...@uk.ibm.com>
---XFAIL--
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
@@ -119,4 +118,4 @@
--single space--
directory created
-===DONE===
\ No newline at end of file
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt
diff -u php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt:1.1.4.2
php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt:1.1.4.2 Wed Nov
26 10:10:17 2008
+++ php-src/ext/standard/tests/file/mkdir_variation1-win32.phpt Fri Dec 12
12:44:48 2008
@@ -2,7 +2,6 @@
Test mkdir() function : usage variation: try invalid pathname
--CREDITS--
Dave Kelsey <d_kel...@uk.ibm.com>
---XFAIL--
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) != "WIN")
@@ -120,4 +119,4 @@
--single space--
Error: 2 - mkdir(): %s, %s(%d)
-===DONE===
\ No newline at end of file
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_variation5.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/mkdir_variation5.phpt
diff -u php-src/ext/standard/tests/file/mkdir_variation5.phpt:1.1.4.2
php-src/ext/standard/tests/file/mkdir_variation5.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/mkdir_variation5.phpt:1.1.4.2 Wed Nov
26 10:10:17 2008
+++ php-src/ext/standard/tests/file/mkdir_variation5.phpt Fri Dec 12
12:44:48 2008
@@ -2,7 +2,6 @@
Test mkdir() function : variation: various valid and invalid paths
--CREDITS--
Dave Kelsey <d_kel...@uk.ibm.com>
---XFAIL--
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
diff -u php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt:1.1.2.2.2.1
Mon Nov 5 17:43:21 2007
+++ php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt Fri Dec 12
12:44:48 2008
@@ -70,6 +70,8 @@
*** 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
