com php-src: Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.: ext/oci8/oci8.c ext/oci8/package.xml ext/oci8/php_oci8.h
| From: | Christopher Jones | Date: | Thu, 04 Aug 2016 07:14:19 +0000 |
| Subject: | com php-src: Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.: ext/oci8/oci8.c ext/oci8/package.xml ext/oci8/php_oci8.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93606@lists.php.net to get a copy of this message | ||
Commit: 0781f512c38024c9f69720a72de11857cd546456
Author: Christopher Jones <christopher.jones@oracle.com> Thu, 4 Aug 2016 14:48:07
+1000
Committer: Christopher Jones <sixd@php.net> Thu, 4 Aug 2016 17:14:19 +1000
Parents: 67264ebc7084d19a33be9a7747c298fe307c7f8b
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0781f512c38024c9f69720a72de11857cd546456
Log:
Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
Changed paths:
M ext/oci8/oci8.c
M ext/oci8/package.xml
M ext/oci8/php_oci8.h
Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 51861b0..488b3b4 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2559,7 +2559,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 8846241..daa55eb 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>
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index da62aab..d1e5013 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -45,7 +45,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "2.1.1"
+#define PHP_OCI8_VERSION "2.1.2"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry