]> granicus.if.org Git - php/commitdiff
Fixed invalid handle error with Implicit Result Sets
authorChristopher Jones <christopher.jones@oracle.com>
Thu, 4 Aug 2016 07:01:57 +0000 (17:01 +1000)
committerChristopher Jones <christopher.jones@oracle.com>
Thu, 4 Aug 2016 07:01:57 +0000 (17:01 +1000)
1  2 
ext/oci8/oci8.c
ext/oci8/package.xml

diff --cc ext/oci8/oci8.c
index 86f22a208f89dcd5b305e82929a7429683968b11,020312b6429ebb9d6272ac9bc28f6dce529434b6..5df00d655d62fe53cbe66fb1232dd058c15caa0c
@@@ -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;
index 88462415cbf76d7874efc2a77b8cbe9e8f43dd7f,07b982f4354f69b7513c800d44c8844e00530a64..25be979e9b4966e925bb75fc196bfa33a7095e9b
@@@ -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>
- Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns)
 +This version is for PHP 7 only.
+ Fixed invalid handle error with Implicit Result Sets
    </notes>
   <contents>
    <dir name="/">
   </extsrcrelease>
   <changelog>
  
 -   <release>2.0.11</release>
 -   <api>2.0.11</api>
+ <release>
+   <version>
 -Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column)
++   <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>
 +  <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>