]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorRemi Collet <remi@php.net>
Tue, 29 Sep 2020 06:52:09 +0000 (08:52 +0200)
committerRemi Collet <remi@php.net>
Tue, 29 Sep 2020 06:52:09 +0000 (08:52 +0200)
* PHP-7.4:
  [ci skip] typo
  Do not decode cookie names anymore
  Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)


Trivial merge