svn: /php/php-src/ branches/PHP_5_3/main/streams/plain_wrapper.c trunk/main/streams/plain_wrapper.c
| From: | Pierre Joye | Date: | Wed, 27 Jan 2010 02:03:41 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/main/streams/plain_wrapper.c trunk/main/streams/plain_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61639@lists.php.net to get a copy of this message | ||
pajoye Wed, 27 Jan 2010 02:03:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294070
Log:
- removed debug breakpoint and improve inline comment
Changed paths:
U php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
U php/php-src/trunk/main/streams/plain_wrapper.c
Modified: php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c 2010-01-27 01:18:43 UTC (rev 294069)
+++ php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c 2010-01-27 02:03:41 UTC (rev 294070)
@@ -1065,7 +1065,7 @@
}
#ifdef PHP_WIN32
- /* Prevent bad things to happen when passing ' ' to MoveFileEx */
+ /* Prevent bad things to happen when invalid path are used with MoveFileEx */
{
int url_from_len = strlen(url_from);
int url_to_len = strlen(url_to);
@@ -1102,7 +1102,7 @@
if (php_check_open_basedir(url_from TSRMLS_CC) || php_check_open_basedir(url_to TSRMLS_CC)) {
return 0;
}
-__debugbreak();
+
ret = VCWD_RENAME(url_from, url_to);
if (ret == -1) {
Modified: php/php-src/trunk/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/trunk/main/streams/plain_wrapper.c 2010-01-27 01:18:43 UTC (rev 294069)
+++ php/php-src/trunk/main/streams/plain_wrapper.c 2010-01-27 02:03:41 UTC (rev 294070)
@@ -1043,7 +1043,7 @@
}
#ifdef PHP_WIN32
- /* Prevent bad things to happen when passing ' ' to MoveFileEx */
+ /* Prevent bad things to happen when invalid path are used with MoveFileEx */
{
int url_from_len = strlen(url_from);
int url_to_len = strlen(url_to);