Merge branch 'PHP-7.0' into PHP-7.1

Sannis · Jul 23, 2016 · 696d6e7 · 696d6e7
2 parents f4d1af7 + f12fd5c
commit 696d6e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -19,6 +19,9 @@ PHP                                                                        NEWS
 
 - Streams:
   . Use strict mode when decoding base64 in data URIs. (Lauri Kenttä)
+  . Fixed bug #41021 (Problems with the ftps wrapper). (vhuk)
+  . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk)
+
 
 - XMLRPC:
   . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
@@ -737,9 +737,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) < 0 ||
-			php_stream_xport_crypto_enable(stream, 1) < 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);