com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/pdo_oci /oci_driver.c ext/pdo_oci/pdo_oci.c ext/pdo_oci /php_pdo_oci_int.h
| From: | Christopher Jones | Date: | Mon, 11 Feb 2019 05:36:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/pdo_oci /oci_driver.c ext/pdo_oci/pdo_oci.c ext/pdo_oci /php_pdo_oci_int.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104531@lists.php.net to get a copy of this message | ||
Commit: 983ba59e3e5edcb330ec0a86ad2eed4f2a5fcd3f
Author: Christopher Jones <christopher.jones@oracle.com> Mon, 11 Feb 2019 16:36:39
+1100
Parents: 471b1d54d507841b1e0a6f83ee55b6d2f5770a8c 1f86dcdd1304aa06b0d429538d0b85da7959f24b
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=983ba59e3e5edcb330ec0a86ad2eed4f2a5fcd3f
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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
Changed paths:
MM ext/pdo_oci/oci_driver.c
MM ext/pdo_oci/pdo_oci.c
MM ext/pdo_oci/php_pdo_oci_int.h
Diff: