cvs: php-src /ext/standard basic_functions.c
| From: | Antony Dovgal | Date: | Thu, 19 Jul 2007 15:56:33 +0000 |
| Subject: | cvs: php-src /ext/standard basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45465@lists.php.net to get a copy of this message | ||
tony2001 Thu Jul 19 15:56:33 2007 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
fix #41989 (move_uploaded_file() & relative path in ZTS mode)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.867&r2=1.868&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.867 php-src/ext/standard/basic_functions.c:1.868
--- php-src/ext/standard/basic_functions.c:1.867 Sun Jul 15 19:50:06 2007
+++ php-src/ext/standard/basic_functions.c Thu Jul 19 15:56:33 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.867 2007/07/15 19:50:06 jani Exp $ */
+/* $Id: basic_functions.c,v 1.868 2007/07/19 15:56:33 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -6038,7 +6038,7 @@
}
VCWD_UNLINK(new_path);
- if (rename(old_path, new_path) == 0) {
+ if (VCWD_RENAME(old_path, new_path) == 0) {
successful = 1;
} else if (php_copy_file_ex(old_path, new_path, STREAM_DISABLE_OPEN_BASEDIR TSRMLS_CC) == SUCCESS)
{
VCWD_UNLINK(old_path);