Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/standard/ftp_fopen_wrapper.c

diff --cc NEWS
index 11cb12ea6ee7e64ea4a62d90dd435373f4c00b58,f264bedb1822ca8d4a60081dce2a2004a7f712cf..bc7b3d970dd1f8771ed073e9b624cfd57a60d09f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -81,37 -48,39 +81,41 @@@ PH
    . Fixed bug #72330 (CSV fields incorrectly split if escape char followed by
      UTF chars). (cmb)
  
 -- SPL:
 -  . Fixed bug #72122 (IteratorIterator breaks '@' error suppression). (kinglozzer)
 -  . Fixed bug #72646 (SplFileObject::getCsvControl does not return the escape
 -    character). (cmb)
+ - Streams:
+   . 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
 +    array elements). (Laruence)
 +
 +- Wddx:
 +  . Fixed bug #72564 (boolean always deserialized as "true") (Remi)
  
 -21 Jul 2016, PHP 5.6.24
 +21 Jul 2016 PHP 7.0.9
  
  - Core:
 -  . Fixed bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA).
 -    (mike dot laspina at gmail dot com, Remi)
 -  . Fixed bug #72496 (Cannot declare public method with signature incompatible
 -    with parent private method). (Pedro Magalhães)
 -  . Fixed bug #72138 (Integer Overflow in Length of String-typed ZVAL). (Stas)
 +  . Fixed bug #72508 (strange references after recursive function call and
 +    "switch" statement). (Laruence)
    . Fixed bug #72513 (Stack-based buffer overflow vulnerability in
 -    virtual_file_ex). (loianhtuan at gmail dot com)
 -  . Fixed bug #72562 (Use After Free in unserialize() with Unexpected Session
 -    Deserialization). (taoguangchen at icloud dot com)
 -  . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries and
 -    applications). (CVE-2016-5385) (Stas)
 +    virtual_file_ex). (Stas)
 +  . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries
 +    and applications). (Stas)
  
  - bz2:
 -  . Fixed bug #72447 (Type Confusion in php_bz2_filter_create()). (gogil at 
 -    stealien dot com).
    . Fixed bug #72613 (Inadequate error handling in bzread()). (Stas)
  
 -- EXIF:
 -  . Fixed bug #50845 (exif_read_data() returns corrupted exif headers).
 -    (Bartosz Dziewoński)
 -- EXIF:
 +- CLI:
 +  . Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify
 +    router.php). (Laruence)
 +
 +- COM:
 +  . Fixed bug #72498 (variant_date_from_timestamp null dereference). (Anatol)
 +
 +- Curl:
 +  . Fixed bug #72541 (size_t overflow lead to heap corruption). (Stas)
 +
 +- Exif:
    . Fixed bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE).
      (Stas)
    . Fixed bug #72618 (NULL Pointer Dereference in exif_process_user_comment).

diff --cc ext/standard/ftp_fopen_wrapper.c
index e59c04fc34bba9d074d19c749fd428cbf411f92c,0260ca1eabd77b7c12c5975647e59c04d43f3305..cca67c878f8b1894633a5b95ba6afc66d304bb2d
--- 1/ext/standard/ftp_fopen_wrapper.c
--- 2/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@@ -732,16 -741,16 +732,16 @@@ php_stream * php_stream_ftp_opendir(php
                 */
                php_stream_close(datastream);
                datastream = NULL;
 -              goto opendir_errexit;   
 +              goto opendir_errexit;
        }
 -      
 +
        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(datastream, 1 TSRMLS_CC) < 0)) {
 +                      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 TSRMLS_CC, "Unable to activate SSL mode");
 +              php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode");
                php_stream_close(datastream);
                datastream = NULL;
                goto opendir_errexit;