Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #67131: setcookie() conditional for empty values not met

Resolved conflicts:
	ext/standard/head.c

diff --cc ext/standard/head.c
index 215089b8a1bf0e85f0e27bd50cbdba2f196d0f7e,56a48a0be3200260e5999e680941c15ebbef6634..c9f81b4f5ad9e3c4a5cc20b879ddb4224b6d5d66
--- 1/ext/standard/head.c
--- 2/ext/standard/head.c
+++ b/ext/standard/head.c
@@@ -120,7 -110,7 +120,7 @@@ PHPAPI int php_setcookie(zend_string *n
  
        cookie = emalloc(len + 100);
  
-       if (value && ZSTR_LEN(value) == 0) {
 -      if (value == NULL || value_len == 0) {
++      if (value == NULL || ZSTR_LEN(value) == 0) {
                /*
                 * MSIE doesn't delete a cookie when you set it to a null value
                 * so in order to force cookies to be deleted, even on MSIE, we

diff --cc ext/standard/tests/network/setcookie.phpt
Simple merge