]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56f9a93 ebfd93f)
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Sun, 20 Nov 2016 07:46:53 +0000 (15:46 +0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 20 Nov 2016 07:46:53 +0000 (15:46 +0800)
* PHP-7.0:
  Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
  Fix #73219 (fix acinclude when / is present)
  make it possible to show specific help pages without interactive session

Conflicts:
acinclude.m4

1  2 
ext/pcre/php_pcre.c patch | diff1 | diff2 | blob | history

diff --cc ext/pcre/php_pcre.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.