Merge branch 'PHP-5.5' into PHP-5.6

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

diff --cc ext/soap/php_encoding.c
Simple merge

diff --cc ext/soap/php_http.c
index 41b73514ebb66b6d9af5584177f8d17b26d8881c,90a2728fbf73aa14d603c126d192bd369c7780dc..2045162367915c6af1c922744dc5631bb194cd17
--- 1/ext/soap/php_http.c
--- 2/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;

diff --cc ext/soap/soap.c
Simple merge

diff --cc main/main.c
Simple merge