com php-src: Fix for bug #54431: NEWS ext/standard/ftp_fopen _wrapper.c

From: Date: Sat, 23 Jul 2016 11:28:42 +0000
Subject: com php-src: Fix for bug #54431: NEWS ext/standard/ftp_fopen _wrapper.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93338@lists.php.net to get a copy of this message
Commit: 65abdb556ddf67068951020b8829c0817697a84e Author: vhuk <vhukkamaki@gmail.com> Thu, 21 Jul 2016 12:20:06 +0300 Committer: Nikita Popov <nikic@php.net> Sat, 23 Jul 2016 13:28:42 +0200 Parents: 4fc1bfa93bca114fc6d31b6f71836064dac157cd Branches: PHP-5.6 PHP-7.0 PHP-7..1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65abdb556ddf67068951020b8829c0817697a84e Log: Fix for bug #54431 Bugs: https://bugs.php.net/54431 Changed paths: M NEWS M ext/standard/ftp_fopen_wrapper.c Diff: diff --git a/NEWS b/NEWS index f04f36b..f264bed 100644 --- a/NEWS +++ b/NEWS @@ -48,6 +48,10 @@ PHP NEWS . Fixed bug #72330 (CSV fields incorrectly split if escape char followed by UTF chars). (cmb) +- Streams: + . Fixed bug #41021 (Problems with the ftps wrapper). (vhuk) + . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk) + - SPL: . Fixed bug #72122 (IteratorIterator breaks '@' error suppression). (kinglozzer) . Fixed bug #72646 (SplFileObject::getCsvControl does not return the escape diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index b290b65..0260ca1 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -746,9 +746,9 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat php_stream_context_set(datastream, context); - if (use_ssl_on_data && (php_stream_xport_crypto_setup(stream, + 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(stream, 1 TSRMLS_CC) < 0)) { + php_stream_xport_crypto_enable(datastream, 1 TSRMLS_CC) < 0)) { php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unable to activate SSL mode"); php_stream_close(datastream);

« previous php.cvs (#93338) next »