com php-src: Merge branch 'PHP-7.2': Zend/zend_object_handl ers.c
| From: | Xinchen Hui | Date: | Wed, 29 Nov 2017 06:54:05 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2': Zend/zend_object_handl ers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100433@lists.php.net to get a copy of this message | ||
Commit: 60c742979dd04779437de83f7113f57a88a5d7f3
Author: Xinchen Hui <laruence@gmail.com> Wed, 29 Nov 2017 14:54:05 +0800
Parents: a049180a731622673ca4467fb81fd0a5c955a6a1 17338ddb481e5a737f0ac3a4f0a9e5683a3bef4d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60c742979dd04779437de83f7113f57a88a5d7f3
Log:
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
Bugs:
https://bugs.php.net/75573
Changed paths:
MM Zend/zend_object_handlers.c
Diff: