diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/oci8/oci8.c | 3 | ||||
| -rw-r--r-- | ext/oci8/package.xml | 26 |
2 files changed, 23 insertions, 6 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 86f22a208f..5df00d655d 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2713,7 +2713,8 @@ void php_oci_fetch_row (INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_arg #else /* OCI_MAJOR_VERSION */ PHP_OCI_ZVAL_TO_STATEMENT(z_statement, invokedstatement); - if (invokedstatement->impres_flag == PHP_OCI_IMPRES_NO_CHILDREN) { + if (invokedstatement->impres_flag == PHP_OCI_IMPRES_NO_CHILDREN || + invokedstatement->impres_flag == PHP_OCI_IMPRES_IS_CHILD) { /* Already know there are no Implicit Result Sets */ statement = invokedstatement; } else if (invokedstatement->impres_flag == PHP_OCI_IMPRES_HAS_CHILDREN) { diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 88462415cb..25be979e9b 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -9,7 +9,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> <description> Use the OCI8 extension to access Oracle Database. PHP OCI8 2.1 builds -with PHP 7. Use 'pecl install oci8-2.0.11' to install OCI8 for PHP +with PHP 7. Use 'pecl install oci8-2.0.12' to install OCI8 for PHP 5.2 - PHP 5.6. Use 'pecl install oci8-1.4.10' to install PHP OCI8 1.4 for PHP 4.3.9 - PHP 5.1. The OCI8 extension can be linked with Oracle client libraries from Oracle Database 12.1, 11, or 10.2. These @@ -46,12 +46,12 @@ Interoperability Support" (ID 207303.1) for details. <active>no</active> </lead> - <date>2016-04-15</date> + <date>2016-08-04</date> <time>12:00:00</time> <version> - <release>2.1.1</release> - <api>2.1.1</api> + <release>2.1.2</release> + <api>2.1.2</api> </version> <stability> <release>stable</release> @@ -60,7 +60,7 @@ Interoperability Support" (ID 207303.1) for details. <license uri="http://www.php.net/license">PHP</license> <notes> This version is for PHP 7 only. -Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) +Fixed invalid handle error with Implicit Result Sets </notes> <contents> <dir name="/"> @@ -469,6 +469,22 @@ Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) <release> <version> + <release>2.1.1</release> + <api>2.1.1</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. +Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) + </notes> +</release> + +<release> + <version> <release>2.1.0</release> <api>2.1.0</api> </version> |