Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/standard/ftp_fopen_wrapper.c

diff --cc NEWS
index 623f31e2008067a87d3b1dd167fc74da1ca7ca7e,8b955722c372d4a37b22e0f654445730befb25ec..3be4c9bb99897e83fbe8b9e7db569f59dccd64de
--- 1/NEWS
--- 2/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 82875777a05284896195f87b89e8a7123b011569,bfb163167af8ed293d1a2ee68f273fed069fc69d..8d0f19c5168338feca033685f9e52e675af4dc03
--- 1/ext/standard/ftp_fopen_wrapper.c
--- 2/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;
        }
  
 -                      STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 ||
 -                      php_stream_xport_crypto_enable(datastream, 1 TSRMLS_CC) < 0)) {
+       php_stream_context_set(datastream, context);
+       if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream,
 -              php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unable to activate SSL mode");
++                      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_url_free(resource);
  
        dirsdata = emalloc(sizeof *dirsdata);