Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
	ext/phar/util.c

diff --cc ext/phar/dirstream.c
index 1275c98d66fbf7e00ff7b2fcb617b3721516879a,e863509b6c072fbd3b4b32f479b65972d2234ed7..6cb78ad692b2943c1e60cfda077821ed035e9c07
--- 1/ext/phar/dirstream.c
--- 2/ext/phar/dirstream.c
+++ b/ext/phar/dirstream.c
@@@ -199,7 -198,7 +199,7 @@@ static php_stream *phar_make_dirstream(
        zend_hash_internal_pointer_reset(manifest);
  
        while (FAILURE != zend_hash_has_more_elements(manifest)) {
-               if (HASH_KEY_IS_STRING != zend_hash_get_current_key(manifest, &str_key, &unused)) {
 -              if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) {
++              if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key(manifest, &str_key, &unused)) {
                        break;
                }
  

diff --cc ext/phar/util.c
index f2f422ef62cf8db9ddef99152571542b3bd8e072,da5a6c127805044d61fbb7cfc26a3023180b90e8..8da8ecc57db0f0a120d69acf529caaca3ac25dd3
--- 1/ext/phar/util.c
--- 2/ext/phar/util.c
+++ b/ext/phar/util.c
@@@ -1929,7 -1970,7 +1929,7 @@@ void phar_add_virtual_dirs(phar_archive
  
        while ((s = zend_memrchr(filename, '/', filename_len))) {
                filename_len = s - filename;
-               if (NULL == zend_hash_str_add_empty_element(&phar->virtual_dirs, filename, filename_len)) {
 -              if (!filename_len || FAILURE == zend_hash_add_empty_element(&phar->virtual_dirs, filename, filename_len)) {
++              if (!filename_len || NULL == zend_hash_str_add_empty_element(&phar->virtual_dirs, filename, filename_len)) {
                        break;
                }
        }

diff --cc ext/phar/zip.c
Simple merge