From: Reeze Xia <reeze@php.net>
Date: Tue, 3 Mar 2015 08:27:35 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~32^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cb3b941df1a0390a1e1c2de1c001fc6df8e955e;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks
---

6cb3b941df1a0390a1e1c2de1c001fc6df8e955e
diff --cc ext/soap/php_http.c
index 41b73514eb,90a2728fbf..2045162367
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@@ -804,10 -809,10 +809,11 @@@ try_again
  		}
  
  		/* Send cookies along with request */
- 		if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_cookies", sizeof("_cookies"), (void **)&cookies) == SUCCESS) {
+ 		if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_cookies", sizeof("_cookies"), (void **)&cookies) == SUCCESS &&
+ 		    Z_TYPE_PP(cookies) == IS_ARRAY) {
  			zval **data;
  			char *key;
 +			uint key_len;
  			int i, n;
  
  			has_cookies = 1;