php-groups.com | Post Question | Search | About | Groups | Contact | Register | Login


New in This Group

cvs: ZendEngine2(PHP_5_3) /tests 024.phpt
7/7/2009 12:11:53 PM

cvs: ZendEngine2 /tests 024.phpt
7/7/2009 11:52:43 AM

cvs: ZendEngine2(PHP_5_2) / zend_builtin_functions.c
6/20/2009 6:45:18 PM

cvs: ZendEngine2 / zend_object_handlers.c
6/12/2009 9:43:22 PM

cvs: ZendEngine2(PHP_5_3) / zend_object_handlers.c
6/12/2009 9:36:53 PM

cvs: ZendEngine2(PHP_5_2) / zend_object_handlers.c
6/12/2009 9:33:46 PM

cvs: ZendEngine2(PHP_5_3) / zend_object_handlers.c /tests bug48533.phpt php-src NEWS
6/12/2009 1:05:25 AM

cvs: ZendEngine2 / zend_object_handlers.c /tests bug48533.phpt
6/12/2009 1:00:30 AM

cvs: ZendEngine2 / zend_compile.c zend_hash.c zend_hash.h
5/27/2009 11:58:44 AM

cvs: ZendEngine2 / zend_API.h
5/25/2009 1:11:09 PM

cvs: TSRM / tsrm_virtual_cwd.c tsrm_virtual_cwd.h Reply

Group: php.zend-engine.cvs Subscribe Posted:7/6/2009 8:55:09 AM Replies:0 Views:8 Items(0)
pajoye Mon Jul 6 08:55:09 2009 UTC

Modified files:
/TSRM tsrm_virtual_cwd.c tsrm_virtual_cwd.h
Log:
- #48771, rename() between drives error: No error

http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.136&r2=1.137&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.136 TSRM/tsrm_virtual_cwd.c:1.137
--- TSRM/tsrm_virtual_cwd.c:1.136 Fri Jun 26 07:44:57 2009
+++ TSRM/tsrm_virtual_cwd.c Mon Jul 6 08:55:08 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: tsrm_virtual_cwd.c,v 1.136 2009/06/26 07:44:57 pajoye Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.137 2009/07/06 08:55:08 pajoye Exp $ */

#include <sys/types.h>
#include <sys/stat.h>
@@ -1371,7 +1371,7 @@
/* rename on windows will fail if newname already exists.
MoveFileEx has to be used */
#ifdef TSRM_WIN32
- retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0) ? -1 : 0;
+ retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0) ? -1 : 0;
#else
retval = rename(oldname, newname);
#endif
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.72&r2=1.73&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.72 TSRM/tsrm_virtual_cwd.h:1.73
--- TSRM/tsrm_virtual_cwd.h:1.72 Fri Jun 26 07:44:57 2009
+++ TSRM/tsrm_virtual_cwd.h Mon Jul 6 08:55:09 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: tsrm_virtual_cwd.h,v 1.72 2009/06/26 07:44:57 pajoye Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.73 2009/07/06 08:55:09 pajoye Exp $ */

#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -305,7 +305,7 @@
/* rename on windows will fail if newname already exists.
MoveFileEx has to be used */
#if defined(TSRM_WIN32)
-# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0 ? -1 : 0)
+# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0 ? -1 : 0)
#else
# define VCWD_RENAME(oldname, newname) rename(oldname, newname)
#endif


paj...@php.net ("Pierre-Alain Joye")
7/6/2009 8:55:09 AM





Reply:
| or Email(not shown): Name: | Register | Login

Alert me when someone responds to this posting.











Newest Articles

note 97095 added to soapclient.soapclient
4/1/2010 5:58:19 AM

note 97094 added to function.sqlite-changes
4/1/2010 5:06:46 AM

note 97093 added to function.sqlite-changes
4/1/2010 5:06:21 AM

note 97092 added to ref.xmlrpc
4/1/2010 4:52:18 AM

note 97091 added to function.var-export
4/1/2010 3:32:03 AM