diff options
| author | Adam Harvey <aharvey@php.net> | 2015-01-08 19:17:53 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-01-08 19:17:53 +0000 |
| commit | ed8ebd6ce40650d54a283e3296151d86e12d7ece (patch) | |
| tree | cd11ccfaaab82fb40f79be230e5373150839b561 /ext/standard/basic_functions.c | |
| parent | e383f05e2f86a5fb94ac2a8b8623c556e3a56171 (diff) | |
| parent | 16b6f6c7f49a6a0e64ce2b20893eb794886c1376 (diff) | |
| download | php-git-ed8ebd6ce40650d54a283e3296151d86e12d7ece.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Calling crypt() with a salt of *0 should always return *1.
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/standard/basic_functions.c')
0 files changed, 0 insertions, 0 deletions