]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 3 Sep 2016 15:04:43 +0000 (17:04 +0200)
committerAnatol Belski <ab@php.net>
Sat, 3 Sep 2016 15:04:43 +0000 (17:04 +0200)
* PHP-7.0:
  fix leak and error check order

1  2 
ext/pgsql/pgsql.c

Simple merge