]> granicus.if.org Git - php/commit
Merge branch 'pull-request/2534' into PHP-7.0
authorTianfang Yang <tianfyan@php.net>
Tue, 22 Aug 2017 05:10:58 +0000 (01:10 -0400)
committerTianfang Yang <tianfyan@php.net>
Tue, 22 Aug 2017 05:10:58 +0000 (01:10 -0400)
commit4bf1a11c0711dad09c3f7e72062993efa0ec67ef
tree183b3641a0ae5ca9235412ea98bb02e31e62f059
parent61538ebadc2ac80b29d6b7a9c355615fe0f40492
parent079bc324cd68532334a8c227d4aacb061f8bfe8c
Merge branch 'pull-request/2534' into PHP-7.0

* pull-request/2534:
  Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)