From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 23 Jun 2014 08:14:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5defa1cf2782f9c2b2ce44323a6d003d2e7af2d;p=php

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
---

f5defa1cf2782f9c2b2ce44323a6d003d2e7af2d