Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:31:43 +0000 (18:31 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:32:16 +0000 (18:32 -0700)
commitfce9a856e73cfb6d9a4521d5b8ea2c15417f3145
treee0bb543493788e0df150c80bac42aed7cf27d3ef
parent40037f1474fcd1317cfcc13412cd0a3a588e3896
parent723ffe2e896f3546b666ba1b1ee677c404a8cf45
Merge branch 'PHP-5.5' into PHP-5.6

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