]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2163'
authorJoe Watkins <krakjoe@php.net>
Tue, 3 Jan 2017 06:48:40 +0000 (06:48 +0000)
committerJoe Watkins <krakjoe@php.net>
Tue, 3 Jan 2017 06:48:40 +0000 (06:48 +0000)
* pull-request/2163:
  import explicit_bzero + strlc* functions update since 1999 algorithms have changed and register k/w not necessary anymore.

1  2 
Zend/zend_portability.h
configure.in
ext/standard/crypt.c
main/php.h

Simple merge
diff --cc configure.in
Simple merge
Simple merge
diff --cc main/php.h
Simple merge