Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c

diff --cc ext/phar/dirstream.c
index e6926ce1541e43cf2ba275a58f0008f140778cb4,75cf049adefbd1e723a69e495016b31e20dbcf85..e863509b6c072fbd3b4b32f479b65972d2234ed7
--- 1/ext/phar/dirstream.c
--- 2/ext/phar/dirstream.c
+++ b/ext/phar/dirstream.c
@@@ -198,7 -207,7 +198,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_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) {
 -              if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &key, &keylen, &unused, 0, NULL)) {
++              if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) {
                        break;
                }
  

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

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