]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a049180 17338dd)
Merge branch 'PHP-7.2'
authorXinchen Hui <laruence@gmail.com>
Wed, 29 Nov 2017 06:54:05 +0000 (14:54 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 29 Nov 2017 06:54:05 +0000 (14:54 +0800)
* 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

1  2 
Zend/zend_object_handlers.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_object_handlers.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.