From: Stanislav Malyshev <stas@php.net>
Date: Tue, 29 Sep 2015 04:42:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.15RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for bug #70433

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

2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6
diff --cc ext/phar/dirstream.c
index e6926ce154,75cf049ade..e863509b6c
--- a/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;
  		}