]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 158b06c 4bf1a11)
Merge branch 'PHP-7.0' into PHP-7.1
authorTianfang Yang <tianfyan@php.net>
Tue, 22 Aug 2017 05:39:55 +0000 (01:39 -0400)
committerTianfang Yang <tianfyan@php.net>
Tue, 22 Aug 2017 05:39:55 +0000 (01:39 -0400)
* PHP-7.0:
  Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)

1  2 
ext/pdo_oci/pdo_oci.c patch | diff1 | diff2 | blob | history

diff --cc ext/pdo_oci/pdo_oci.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.