From: Christoph M. Becker <cmb@php.net>
Date: Mon, 24 Aug 2015 21:11:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0RC2~2^2~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=405f8b5c91fe8431fdd2547ce9b7ffb9662e848a;p=php

Merge branch 'PHP-5.6'

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

Resolved conflicts:
	ext/standard/head.c
---

405f8b5c91fe8431fdd2547ce9b7ffb9662e848a
diff --cc ext/standard/head.c
index 215089b8a1,56a48a0be3..c9f81b4f5a
--- a/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