com php-src: Merge branch 'PHP-5.6': ext/standard/head.c ext/standard/tests/network/setcookie.phpt
| From: | Christoph Michael Becker | Date: | Mon, 24 Aug 2015 21:11:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/standard/head.c ext/standard/tests/network/setcookie.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88747@lists.php.net to get a copy of this message | ||
Commit: 405f8b5c91fe8431fdd2547ce9b7ffb9662e848a
Author: Christoph M. Becker <cmb@php.net> Mon, 24 Aug 2015 23:11:03 +0200
Parents: f9f568aa1e1564e068f2319af34d5834b3f3da09 e5adf2b427915ff070ddcba24d7c4ed3014743e9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=405f8b5c91fe8431fdd2547ce9b7ffb9662e848a
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #67131: setcookie() conditional for empty values not met
Resolved conflicts:
ext/standard/head.c
Bugs:
https://bugs.php.net/67131
Changed paths:
MM ext/standard/head.c
MM ext/standard/tests/network/setcookie.phpt
Diff:
diff --cc ext/standard/head.c
index 215089b,56a48a0..c9f81b4
--- 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