diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2013-10-05 09:57:13 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2013-10-05 09:57:13 -0700 |
| commit | d74b9cfee528936a50af7772c3dc56843a068c7f (patch) | |
| tree | 42c00e21011c95d6f493805ea870f419b42e7880 /ext/ftp/php_ftp.c | |
| parent | 690bbe170d9ed4597629e4e986575fbe0a2cb796 (diff) | |
| parent | 3aaee86ee33af276d2e879f5a645cc6dc850de22 (diff) | |
| download | php-git-d74b9cfee528936a50af7772c3dc56843a068c7f.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
Fix bug #65667: ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Fixed bug #64230 (XMLReader does not suppress errors)
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
fix test
fix memleak on resetting rebind_proc
Fix bug #65322: compile time errors won't trigger auto loading
5.4.20 release date
Add information about which INI file is which inside respective files
- Updated to version 2013.6 (2013f)
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); } |