From: Tianfang Yang <tianfyan@php.net>
Date: Tue, 22 Aug 2017 05:44:20 +0000 (-0400)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d128fdc2dce1f6c59489d82555152c5ee6891982;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
---

d128fdc2dce1f6c59489d82555152c5ee6891982