cvs: php-src /ext/ftp php_ftp.c
| From: | Ilia Alshanetsky | Date: | Tue, 04 Nov 2003 20:56:47 +0000 |
| Subject: | cvs: php-src /ext/ftp php_ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24434@lists.php.net to get a copy of this message | ||
iliaa Tue Nov 4 15:56:47 2003 EDT
Modified files:
/php-src/ext/ftp php_ftp.c
Log:
Fixed bug #26113 (remove leftover local file when ftp_get/ftp_nb_get fails)
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.96 php-src/ext/ftp/php_ftp.c:1.97
--- php-src/ext/ftp/php_ftp.c:1.96 Thu Sep 18 13:36:08 2003
+++ php-src/ext/ftp/php_ftp.c Tue Nov 4 15:56:47 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.96 2003/09/18 17:36:08 pollita Exp $ */
+/* $Id: php_ftp.c,v 1.97 2003/11/04 20:56:47 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -710,6 +710,7 @@
if (!ftp_get(ftp, outstream, remote, xtype, resumepos TSRMLS_CC)) {
php_stream_close(outstream);
+ VCWD_UNLINK(local);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);
RETURN_FALSE;
}
@@ -772,6 +773,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);
}