]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 22 Mar 2015 23:46:30 +0000 (16:46 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 22 Mar 2015 23:46:30 +0000 (16:46 -0700)
commit40037f1474fcd1317cfcc13412cd0a3a588e3896
treee90f4fa64e22caf420b9de5faaadcdedc903417c
parent1ec430d4edd90ad4ac6523b23ca669253535bc44
parent0c27a8eb61813f04c92caf578d24bb3b76eb6651
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #68760: Fix freeing null segfault. Added test for behaviour.

Conflicts:
ext/sqlite3/tests/bug68760.phpt