From: Christopher Jones <christopher.jones@oracle.com>
Date: Mon, 11 Feb 2019 06:03:51 +0000 (+1100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~1087
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1b8e6b1c1aaf6cb2a22b53c2e33278d269d2cf4;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Merge PDO_OCI PR
  PDO_OCI tracing attribute PR merge
  pdo_oci: Add client identifier and module attrs
  pdo_oci: Register new attr constants and add tests
  pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO
---

a1b8e6b1c1aaf6cb2a22b53c2e33278d269d2cf4