]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 687fa7d 53158f2)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 23 Jun 2014 08:14:08 +0000 (10:14 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 23 Jun 2014 08:14:08 +0000 (10:14 +0200)
* PHP-5.6:
  testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
  mention 67468 fix in NEWS
  Fix Bug #67468  Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded

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

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