From 65abdb556ddf67068951020b8829c0817697a84e Mon Sep 17 00:00:00 2001 From: vhuk Date: Thu, 21 Jul 2016 12:20:06 +0300 Subject: [PATCH] Fix for bug #54431 --- NEWS | 4 ++++ ext/standard/ftp_fopen_wrapper.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f04f36b38f4..f264bedb182 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 b290b65095f..0260ca1eabd 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);