]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf0cf5b c11b23c)
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 15 Feb 2016 08:09:30 +0000 (00:09 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Feb 2016 08:09:30 +0000 (00:09 -0800)
* PHP-5.6:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

Conflicts:
ext/xsl/xsltprocessor.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.