]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1807673 6b9df7a)
Merge branch 'PHP-5.4'
authorAdam Harvey <aharvey@php.net>
Mon, 12 Nov 2012 12:09:18 +0000 (20:09 +0800)
committerAdam Harvey <aharvey@php.net>
Mon, 12 Nov 2012 12:09:18 +0000 (20:09 +0800)
* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string

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.