diff options
author | Derick Rethans <github@derickrethans.nl> | 2014-01-02 10:57:46 +0000 |
---|---|---|
committer | Derick Rethans <github@derickrethans.nl> | 2014-01-02 10:57:46 +0000 |
commit | dee77f237c7989359986f5020d450c1b9a93464c (patch) | |
tree | 0b8de5050f07364b3fcb03fa420686505947dc79 /ext/ftp/ftp.c | |
parent | e881334e496be92ac6d1751f25d006203f3229d6 (diff) | |
parent | 3c3ff434329d2f505b00a79bacfdef95ca96f0d2 (diff) | |
download | php-git-dee77f237c7989359986f5020d450c1b9a93464c.tar.gz |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Diffstat (limited to 'ext/ftp/ftp.c')
-rw-r--r-- | ext/ftp/ftp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index b82017e21f..fce9ecf841 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -178,6 +178,10 @@ ftp_close(ftpbuf_t *ftp) if (ftp->data) { data_close(ftp, ftp->data); } + if (ftp->stream && ftp->closestream) { + TSRMLS_FETCH(); + php_stream_close(ftp->stream); + } if (ftp->fd != -1) { #if HAVE_OPENSSL_EXT if (ftp->ssl_active) { |