granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 90cccff acf1472)

author	Anatol Belski <ab@php.net>
	Fri, 15 Dec 2017 14:34:44 +0000 (15:34 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 15 Dec 2017 14:34:44 +0000 (15:34 +0100)
commit	171f1baff1116f646ea6a860fa7c4ea84f2772ea
tree	36c880f9386bb99f4186defd01acccb51afa5682	tree \| snapshot
parent	90cccffe89ab7526c3e3a00420a04ac419161458	commit \| diff
parent	acf1472ffde08a514fa44ef4b5baa0c67ae1b3f2	commit \| diff

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #75671 pg_version() crashes when called on a connection to cockroach

ext/pgsql/pgsql.c

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