Skip to content
Permalink
Browse files

Fix for bug #54431

  • Loading branch information...
vhuk authored and nikic committed Jul 21, 2016
1 parent 4fc1bfa commit 65abdb556ddf67068951020b8829c0817697a84e
Showing with 6 additions and 2 deletions.
  1. +4 −0 NEWS
  2. +2 −2 ext/standard/ftp_fopen_wrapper.c
4 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
@@ -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);

0 comments on commit 65abdb5

Please sign in to comment.
You can’t perform that action at this time.