com php-src: Fixed invalid handle error with Implicit Result Sets: ext/oci8/oci8.c ext/oci8/package.xml
| From: | Christopher Jones | Date: | Thu, 04 Aug 2016 07:01:57 +0000 |
| Subject: | com php-src: Fixed invalid handle error with Implicit Result Sets: ext/oci8/oci8.c ext/oci8/package.xml | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93604@lists.php.net to get a copy of this message | ||
Commit: 2b7a699acd3c064a39c1df8c7f7a0a5b66e07f0c
Author: Christopher Jones <christopher.jones@oracle.com> Thu, 4 Aug 2016 17:01:57
+1000
Parents: 06be3c659c27d2e32d32b9c854df95395e2f3f6e 78488a54c8f23c16bf0ca044c50c0fac8e303400
Branches: PHP-7.0
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=2b7a699acd3c064a39c1df8c7f7a0a5b66e07f0c
Log:
Fixed invalid handle error with Implicit Result Sets
Changed paths:
MM ext/oci8/oci8.c
MM ext/oci8/package.xml
Diff:
diff --cc ext/oci8/oci8.c
index 86f22a2,020312b..5df00d6
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@@ -2713,9 -2692,10 +2713,10 @@@ void php_oci_fetch_row (INTERNAL_FUNCTI
#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;
+ statement = invokedstatement;
} else if (invokedstatement->impres_flag == PHP_OCI_IMPRES_HAS_CHILDREN) {
/* Previously saw an Implicit Result Set in an earlier invocation of php_oci_fetch_row */
statement = (php_oci_statement *)invokedstatement->impres_child_stmt;
diff --cc ext/oci8/package.xml
index 8846241,07b982f..25be979
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@@ -46,12 -46,12 +46,12 @@@ Interoperability Support" (ID 207303.1
<active>no</active>
</lead>
- <date>2016-04-15</date>
- <date>2016-07-04</date>
++ <date>2016-08-04</date>
<time>12:00:00</time>
<version>
- <release>2.1.1</release>
- <api>2.1.1</api>
- <release>2.0.12</release>
- <api>2.0.12</api>
++ <release>2.1.2</release>
++ <api>2.1.2</api>
</version>
<stability>
<release>stable</release>
@@@ -59,8 -59,7 +59,8 @@@
</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)
+ Fixed invalid handle error with Implicit Result Sets
</notes>
<contents>
<dir name="/">
@@@ -469,17 -467,16 +469,33 @@@
<release>
<version>
- <release>2.0.11</release>
- <api>2.0.11</api>
++ <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>
-Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column)
++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>
+ <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.
+Updated driver name format.
</notes>
</release>