Merge branch 'PHP-5.6' into PHP-7.0

author Andrey Hristov <andrey.hristov@dnhsoft.com>

Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)

committer Andrey Hristov <andrey.hristov@dnhsoft.com>

Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)
author Andrey Hristov <andrey.hristov@dnhsoft.com>
Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)
committer Andrey Hristov <andrey.hristov@dnhsoft.com>
Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)
diff --cc ext/mysqli/mysqli_api.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd_net.c
Simple merge
author	Andrey Hristov <andrey.hristov@dnhsoft.com>
	Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)
committer	Andrey Hristov <andrey.hristov@dnhsoft.com>
	Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)
		1	2
ext/mysqli/mysqli_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_net.c	patch \|	diff1 \|	diff2 \|	blob \| history