diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-29 14:54:05 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-29 14:54:05 +0800 |
| commit | 60c742979dd04779437de83f7113f57a88a5d7f3 (patch) | |
| tree | f23fefc04af8bef50f82db2cb38fba6d842e846b /main/php_variables.c | |
| parent | a049180a731622673ca4467fb81fd0a5c955a6a1 (diff) | |
| parent | 17338ddb481e5a737f0ac3a4f0a9e5683a3bef4d (diff) | |
| download | php-git-60c742979dd04779437de83f7113f57a88a5d7f3.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Revert "ext/sodium: pwhash: do not warn on low parameters"
Conflicts:
Zend/zend_object_handlers.c
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions