Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.

This commit is contained in:
Christopher Jones 2016-08-04 14:48:07 +10:00
parent 4f861b6071
commit 78488a54c8
4 changed files with 26 additions and 7 deletions

3
NEWS
View file

@ -63,6 +63,9 @@ PHP NEWS
. Fixed bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error).
(ju1ius)
- OCI8:
. Fixed invalid handle error with Implicit Result Sets. (Chris Jones)
- PCRE:
. Fixed bug #72688 (preg_match missing group names in matches). (cmb)

View file

@ -2692,7 +2692,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) {

View file

@ -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-07-04</date>
<time>12:00:00</time>
<version>
<release>2.0.11</release>
<api>2.0.11</api>
<release>2.0.12</release>
<api>2.0.12</api>
</version>
<stability>
<release>stable</release>
@ -59,7 +59,7 @@ Interoperability Support" (ID 207303.1) for details.
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column)
Fixed invalid handle error with Implicit Result Sets
</notes>
<contents>
<dir name="/">
@ -465,6 +465,21 @@ Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed f
</extsrcrelease>
<changelog>
<release>
<version>
<release>2.0.11</release>
<api>2.0.11</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column)
</notes>
</release>
<release>
<version>
<release>2.0.10</release>

View file

@ -45,7 +45,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
#define PHP_OCI8_VERSION "2.0.11"
#define PHP_OCI8_VERSION "2.0.12"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry