From: Lior Kaplan Date: Wed, 19 Jul 2017 14:26:38 +0000 (+0300) Subject: Merge branch 'PHP-7.0' into PHP-7.1 X-Git-Tag: php-7.3.0alpha1~1886^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b36f3d71f2737209b636a888eb1f299561a1e16;p=php Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Add oci8_failover.c to config.w32, follow up for commit 1b797f7a --- 2b36f3d71f2737209b636a888eb1f299561a1e16