com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/standard/ftp_fopen_wrapper.c

Commit: a2a2ea18feea8945be7a7f02f384f015fa47076a Author: Nikita Popov <nikic@php.net> Fri, 5 Aug 2016 23:09:30 +0200 Parents: 807e81937b290ddb71152196aae3bbaca9a53c7e 65056e9d6c74adef89332080b5458fd4850fb3b7 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a2a2ea18feea8945be7a7f02f384f015fa47076a Log: Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: ext/standard/ftp_fopen_wrapper.c Changed paths: MM NEWS MM ext/standard/ftp_fopen_wrapper.c Diff: diff --cc NEWS index 623f31e,8b95572..3be4c9b --- a/NEWS +++ b/NEWS @@@ -1,34 -1,13 +1,38 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2016, PHP 5.6.26 +?? ??? 2016 PHP 7.0.11 + +- Core: + . Fixed bug #72767 (PHP Segfaults when trying to expand an infinite operator). + (Nikita) + +- GD: + . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb) + +- Session: + . Fixed bug #72724 (PHP7: session-uploadprogress kills httpd). (Nikita) + ++- Streams: ++ . Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails ++ with IIS FTP 7.5, 8.5). (vhuk) + -18 Aug 2016, PHP 5.6.25 + +?? ??? 2016 PHP 7.0.10 - Core: + . Fixed bug #72629 (Caught exception assignment to variables ignores + references). (Laruence) + . Fixed bug #72594 (Calling an earlier instance of an included anonymous + class fatals). (Laruence) . Fixed bug #72581 (previous property undefined in Exception after deserialization). (Laruence) + . Fixed bug #72496 (Cannot declare public method with signature incompatible + with parent private method). (Pedro Magalhães) . Fixed bug #72024 (microtime() leaks memory). (maroszek at gmx dot net) + . Fixed bug #71911 (Unable to set --enable-debug on building extensions by + phpize on Windows). (Yuji Uchiyama) + . Fixed bug causing ClosedGeneratorException being thrown into the calling + code instead of the Generator yielding from. (Bob) . Implemented FR #72614 (Support "nmake test" on building extensions by phpize). (Yuji Uchiyama) . Fixed bug #72641 (phpize (on Windows) ignores PHP_PREFIX). diff --cc ext/standard/ftp_fopen_wrapper.c index 8287577,bfb1631..8d0f19c --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@@ -728,19 -737,8 +728,7 @@@ php_stream * php_stream_ftp_opendir(php goto opendir_errexit; } - php_stream_context_set(datastream, context); - if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, - STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 || - php_stream_xport_crypto_enable(datastream, 1) < 0)) { - - php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode"); - php_stream_close(datastream); - datastream = NULL; - goto opendir_errexit; - } - -- - php_stream_printf(stream TSRMLS_CC, "NLST %s\r\n", (resource->path != NULL ? resource->path : "/")); + php_stream_printf(stream, "NLST %s\r\n", (resource->path != NULL ? resource->path : "/")); result = GET_FTP_RESULT(stream); if (result != 150 && result != 125) { @@@ -752,6 -750,17 +740,17 @@@ goto opendir_errexit; } + php_stream_context_set(datastream, context); + if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, - STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 || - php_stream_xport_crypto_enable(datastream, 1 TSRMLS_CC) < 0)) { ++ STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 || ++ php_stream_xport_crypto_enable(datastream, 1) < 0)) { + - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unable to activate SSL mode"); ++ php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode"); + php_stream_close(datastream); + datastream = NULL; + goto opendir_errexit; + } + php_url_free(resource); dirsdata = emalloc(sizeof *dirsdata);