]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 10 Sep 2016 00:49:30 +0000 (02:49 +0200)
committerAnatol Belski <ab@php.net>
Sat, 10 Sep 2016 00:49:30 +0000 (02:49 +0200)
commit435048935e709ba12e89b348ec7eb4b45ab37f0b
tree9682844613621829601c6acb60abdbccd9324321
parenta90e438af34911c63e07898ee637413748c724a5
parente539ea439b78a5f6ee41b2338fef377aa77632c1
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bug #73058 crypt broken when salt is 'too' long
ext/standard/crypt.c