]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 98fceaf 26fdebc)
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Sun, 12 Feb 2017 12:36:18 +0000 (20:36 +0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 12 Feb 2017 12:36:18 +0000 (20:36 +0800)
commitb56114e8fb90098e4f56e8bea92c8d5450a76483
treede4b30c83ffeee2d414126b431ed5f7c583e7f2dtree | snapshot
parent98fceaf61eff17d98926f3e6f8f39301066ca001commit | diff
parent26fdebc63b642417820017e550d46c1b1f773504commit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)

Conflicts:
Zend/zend_operators.c
Zend/zend_operators.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.