diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-08-24 23:11:03 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-08-24 23:11:03 +0200 |
| commit | 405f8b5c91fe8431fdd2547ce9b7ffb9662e848a (patch) | |
| tree | 347fded17dcd1cf3adc5c8dfa4a49d14201a8940 /sapi/phpdbg/phpdbg_help.c | |
| parent | f9f568aa1e1564e068f2319af34d5834b3f3da09 (diff) | |
| parent | e5adf2b427915ff070ddcba24d7c4ed3014743e9 (diff) | |
| download | php-git-405f8b5c91fe8431fdd2547ce9b7ffb9662e848a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #67131: setcookie() conditional for empty values not met
Resolved conflicts:
ext/standard/head.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions