diff options
author | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
commit | 29e755ac6669fa1801bf1e1c1e6acee8d78c9498 (patch) | |
tree | fa033f900da9649cf5064c7a9d2a4a8916403ee1 /ext/ftp/php_ftp.c | |
parent | 8495d6303400edd9b84a6febd2a6b62b38e11c97 (diff) | |
parent | b0a36007abb522b6b1e3a6b3108eb726053b9d72 (diff) | |
download | php-git-29e755ac6669fa1801bf1e1c1e6acee8d78c9498.tar.gz |
Merge branch 'PHP-5.4' into JSONWhitespaceFix
Diffstat (limited to 'ext/ftp/php_ftp.c')
-rw-r--r-- | ext/ftp/php_ftp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index da22e0b63e..21e13ea460 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -968,7 +968,9 @@ PHP_FUNCTION(ftp_nb_get) RETURN_LONG(PHP_FTP_FAILED); } - php_stream_close(outstream); + if (ret == PHP_FTP_FINISHED){ + php_stream_close(outstream); + } RETURN_LONG(ret); } |