]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.0:
  Bug #73058 crypt broken when salt is 'too' long

1  2 
ext/standard/crypt.c

Simple merge