iliaa Tue Nov 4 15:56:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/ftp php_ftp.c
Log:
MFH: Fixed bug #26113 (remove leftover local file when ftp_get/ftp_nb_get
fails).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.456 php-src/NEWS:1.1247.2.457
--- php-src/NEWS:1.1247.2.456 Tue Nov 4 15:40:31 2003
+++ php-src/NEWS Tue Nov 4 15:56:55 2003
@@ -3,6 +3,8 @@
?? ??? 2003, Version 4.3.5
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26113 (remove leftover local file when ftp_get/ftp_nb_get fails).
+ (Ilia)
- Fixed bug #26105 (Compile failure on gcc version 3.0.X). (Ilia)
- Fixed bug #26103 (ext/mime_magic causes compile failure in ext/mssql). (Jani)
- Fixed bug #26097 (gdImageColorClosestAlpha() returns incorrect results).
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.74.2.13 php-src/ext/ftp/php_ftp.c:1.74.2.14
--- php-src/ext/ftp/php_ftp.c:1.74.2.13 Mon Sep 8 18:32:33 2003
+++ php-src/ext/ftp/php_ftp.c Tue Nov 4 15:56:56 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.74.2.13 2003/09/08 22:32:33 pollita Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.14 2003/11/04 20:56:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -636,6 +636,7 @@
if (!ftp_get(ftp, outstream, remote, xtype, resumepos)) {
php_stream_close(outstream);
+ VCWD_UNLINK(local);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);
RETURN_FALSE;
}
@@ -711,6 +712,7 @@
if ((ret = ftp_nb_get(ftp, outstream, remote, xtype, resumepos TSRMLS_CC)) ==
PHP_FTP_FAILED) {
php_stream_close(outstream);
+ VCWD_UNLINK(local);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);
RETURN_LONG(PHP_FTP_FAILED);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
