--- embedaddon/php/ext/ftp/php_ftp.c	2012/05/29 12:34:39	1.1.1.2
+++ embedaddon/php/ext/ftp/php_ftp.c	2013/10/14 08:02:19	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ftp.c,v 1.1.1.2 2012/05/29 12:34:39 misho Exp $ */
+/* $Id: php_ftp.c,v 1.1.1.4 2013/10/14 08:02:19 misho Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -784,8 +784,8 @@ PHP_FUNCTION(ftp_nb_fget)
 	ftptype_t	xtype;
 	php_stream	*stream;
 	char		*file;
-	int		file_len, ret;
-	long		mode, resumepos=0;
+	int		file_len;
+	long		mode, resumepos=0, ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
 		return;
@@ -968,9 +968,7 @@ PHP_FUNCTION(ftp_nb_get)
 		RETURN_LONG(PHP_FTP_FAILED);
 	}
 
-	if (ret == PHP_FTP_FINISHED) {
-		php_stream_close(outstream);
-	}
+        php_stream_close(outstream);
 
 	RETURN_LONG(ret);
 }
@@ -982,7 +980,7 @@ PHP_FUNCTION(ftp_nb_continue)
 {
 	zval		*z_ftp;
 	ftpbuf_t	*ftp;
-	int		ret;
+	long		ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) {
 		return;
@@ -1120,7 +1118,7 @@ PHP_FUNCTION(ftp_put)
 	ftpbuf_t	*ftp;
 	ftptype_t	xtype;
 	char		*remote, *local;
-	int		remote_len, local_len;
+	long		remote_len, local_len;
 	long		mode, startpos=0;
 	php_stream 	*instream;
 
@@ -1173,8 +1171,8 @@ PHP_FUNCTION(ftp_nb_put)
 	ftpbuf_t	*ftp;
 	ftptype_t	xtype;
 	char		*remote, *local;
-	int		remote_len, local_len, ret;
-	long		mode, startpos=0;
+	int		remote_len, local_len;
+	long		mode, startpos=0, ret;
 	php_stream 	*instream;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {