]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorTianfang Yang <tianfyan@php.net>
Tue, 22 Aug 2017 05:44:20 +0000 (01:44 -0400)
committerTianfang Yang <tianfyan@php.net>
Tue, 22 Aug 2017 05:44:20 +0000 (01:44 -0400)
* PHP-7.1:
  Update NEWS
  Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)


Trivial merge