]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2'
authorFrank Denis <github@pureftpd.org>
Sat, 22 Jul 2017 20:09:21 +0000 (22:09 +0200)
committerFrank Denis <github@pureftpd.org>
Sat, 22 Jul 2017 20:09:21 +0000 (22:09 +0200)
commit934cfa35f8c3946b812739e4ed5afe0f456610eb
tree5b19ee4856c2bcea8fc7e54aac8d1596befda030
parentc908caf6dfd2f64ee2a72137f1bdb32a73e0e0e0
parent401188cbf986e3cbb0ae8d7b49f7ba31b79be9bd
Merge branch 'PHP-7.2'

* PHP-7.2:
  sodium ext: require libsodium >= 1.0.8
  sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed
  sodium ext: remove redundant and obsolete macros