tony2001 Thu Jul 19 15:49:46 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard basic_functions.c
Log:
MFH: fix #41989 (move_uploaded_file() & relative path in ZTS mode)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.840&r2=1.2027.2.547.2.841&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.840 php-src/NEWS:1.2027.2.547.2.841
--- php-src/NEWS:1.2027.2.547.2.840 Thu Jul 19 10:50:16 2007
+++ php-src/NEWS Thu Jul 19 15:49:44 2007
@@ -60,6 +60,7 @@
- Fixed bug #42019 (configure option --with-adabas=DIR does not work). (Jani)
- Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
(bob at mroczka dot com, Jani)
+- Fixed bug #41989 (move_uploaded_file() & relative path in ZTS mode). (Tony)
- Fixed bug #41964 (strtotime returns a timestamp for non-time string of
pattern '(A|a) .+'). (Derick)
- Fixed bug #41961 (Ensure search for hidden private methods does not stray
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.58&r2=1.725.2.31.2.59&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.58
php-src/ext/standard/basic_functions.c:1.725.2.31.2.59
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.58 Wed Jul 11
17:36:55 2007
+++ php-src/ext/standard/basic_functions.c Thu Jul 19 15:49:45 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.58 2007/07/11 17:36:55 johannes Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.59 2007/07/19 15:49:45 tony2001 Exp $
*/
#include "php.h"
#include "php_streams.h"
@@ -6096,7 +6096,7 @@
}
VCWD_UNLINK(Z_STRVAL_PP(new_path));
- if (rename(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path)) == 0) {
+ if (VCWD_RENAME(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path)) == 0) {
successful = 1;
} else if (php_copy_file_ex(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path),
STREAM_DISABLE_OPEN_BASEDIR TSRMLS_CC) == SUCCESS) {
VCWD_UNLINK(Z_STRVAL_PP(path));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
