]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2' into PHP-7.3
authorJoe Watkins <krakjoe@php.net>
Wed, 19 Jun 2019 10:42:25 +0000 (12:42 +0200)
committerJoe Watkins <krakjoe@php.net>
Wed, 19 Jun 2019 10:42:25 +0000 (12:42 +0200)
commita5db31946361af4655c9ed4622f2c87c062009f0
tree821138c297f84df8a45bbe03fad3414f30fb4f8f
parent264536877dd63a8cee0175e636fdec8046e305c0
parent31a1c1e67c93de186d8faf368784a8745b23f5b1
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix setcookie Max-Age to use php_time
ext/standard/head.c