]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf5defa1cf2782f9c2b2ce44323a6d003d2e7af2d
tree37bc3851de71ce6d1e9178eb86ee18e84b37654etree | snapshot
parent687fa7d63d651dcace32054a6e50131f9edfa07dcommit | diff
parent53158f2c32c71bddbfaa390c0c4758bc98540946commit | diff
Merge branch 'PHP-5.6'

* 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
Zend/zend_indent.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.