]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:30:21 +0000 (18:30 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:30:56 +0000 (18:30 -0700)
commit723ffe2e896f3546b666ba1b1ee677c404a8cf45
tree0e2208d78c0f8dde2c45009b254027dbec3429f5
parent0c27a8eb61813f04c92caf578d24bb3b76eb6651
parent968fbc6acf0bc27be17c0209be7f966e89a55943
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bacport fix bug #68741 - Null pointer dereference
  Check that the type is correct
NEWS
ext/pgsql/pgsql.c
ext/standard/incomplete_class.c