]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Wed, 22 Jan 2014 10:23:52 +0000 (19:23 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Wed, 22 Jan 2014 10:23:52 +0000 (19:23 +0900)
* PHP-5.6:
  Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
  Re-fixed bug #66469


Trivial merge