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

Merge branch 'PHP-7.0' into PHP-7.1

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

441487cd05b86184f0b524eb18678fdf56a169c1