diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2017-06-20 14:55:27 +1000 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2017-06-20 14:55:27 +1000 |
| commit | f39c9d8345791037b412ec4e36848a59f93c1ff2 (patch) | |
| tree | c72196f99907794983e77d54ce35649af8af178f | |
| parent | b1431c6174dcfa9ed9438d3096f5f5e61a0b6811 (diff) | |
| parent | 64447030bbbf0364f72077cd1cf99f5a62f3b469 (diff) | |
| download | php-git-f39c9d8345791037b412ec4e36848a59f93c1ff2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bump OCI8 version
| -rw-r--r-- | ext/oci8/package.xml | 19 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index d32cfc7bc8..f863b5d44d 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -46,7 +46,7 @@ Interoperability Support" (ID 207303.1) for details. <active>no</active> </lead> - <date>2017-04-12</date> + <date>2017-06-20</date> <time>12:00:00</time> <version> @@ -447,6 +447,7 @@ Fixed uninitialized data causing random crash <file name="oci8_interface.c" role="src" /> <file name="oci8_lob.c" role="src" /> <file name="oci8_statement.c" role="src" /> + <file name="oci8_failover.c" role="src" /> <file name="php_oci8.h" role="src" /> <file name="php_oci8_int.h" role="src" /> <file name="README" role="doc" /> @@ -470,6 +471,22 @@ Fixed uninitialized data causing random crash <release> <version> + <release>2.1.5</release> + <api>2.1.5</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <license uri="http://www.php.net/license">PHP</license> + <notes> +This version is for PHP 7 only. +Added TAF callback support (PR #2459, KoenigsKind) + </notes> +</release> + +<release> + <version> <release>2.1.3</release> <api>2.1.3</api> </version> diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index 2266e8c10c..8070cb5b8c 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -43,7 +43,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "2.1.4" +#define PHP_OCI8_VERSION "2.1.5" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry |