Fix --enable-maintainer-zts mode in OCI8 2.0

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index c3bb49c2df114b542428bab7440f6a8288ad14bc..fe22c6f4597774d74afd28cfeab9432be0a90023 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2684,7 +2684,7 @@ void php_oci_fetch_row (INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_arg
                }
                if (invokedstatement->impres_count > 0) {
                        /* Make it so the fetch occurs on the first Implicit Result Set */
-                       statement = php_oci_get_implicit_resultset(invokedstatement);
+                       statement = php_oci_get_implicit_resultset(invokedstatement TSRMLS_CC);
                        if (!statement)
                                RETURN_FALSE;
                        invokedstatement->impres_count--;
@@ -2701,7 +2701,7 @@ void php_oci_fetch_row (INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_arg
                /* End of fetch */
                if (invokedstatement->impres_count > 0) {
                        /* Check next Implicit Result Set */
-               statement = php_oci_get_implicit_resultset(invokedstatement);
+               statement = php_oci_get_implicit_resultset(invokedstatement TSRMLS_CC);
                        if (!statement)
                                RETURN_FALSE;
                invokedstatement->impres_count--;

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index f93c0c0d451e2f0dcb60d9236f2730dfde4db3b6..483ddcf75f9f367ac5784254a3fc5a9c637eccc1 100644 (file)
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -2409,7 +2409,7 @@ PHP_FUNCTION(oci_get_implicit_resultset)
 
        PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
-       imp_statement = php_oci_get_implicit_resultset(statement);
+       imp_statement = php_oci_get_implicit_resultset(statement TSRMLS_CC);
 
        if (imp_statement) {
                if (php_oci_statement_execute(imp_statement, (ub4)OCI_DEFAULT TSRMLS_CC))

diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 0f3023caed35e810af9499d4f134ba30435cda5a..44358f0b64edc772c5b6fc2d6b90ed9aad1c5836 100644 (file)
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -44,8 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <time>12:00:00</time>
 
   <version>
-   <release>2.0.0</release>
-   <api>2.0.0</api>
+   <release>2.0.1</release>
+   <api>2.0.1</api>
   </version>
   <stability>
    <release>devel</release>
@@ -53,70 +53,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
   <notes> 
-    - NEW FUNCTIONALITY:
- 
-      - Added Implicit Result Set support for Oracle Database 12c.
-       Streaming of all IRS's returned from a PL/SQL block is available
-       via oci_fetch_array, oci_fetch_assoc, oci_fetch_object and
-       oci_fetch_row (but not oci_fetch or oci_fetch_all).
-       Alternatively individual IRS statement resources can be obtained
-       with the new function 'oci_get_implicit_resultset' and passed to
-       any oci_fetch_* function.
-
-      - Added DTrace probes enabled with PHP's generic --enable-dtrace
-
-    - IMPROVED FUNCTIONALITY:
- 
-      - Using 'oci_execute($s, OCI_NO_AUTO_COMMIT)' for a SELECT no
-       longer unnecessarily initiates an internal ROLLBACK during
-       connection close.  This can improve overall scalability by
-       reducing "round trips" between PHP and the database.
- 
-    - CHANGED FUNCTIONALITY:
- 
-      - PHPINFO() CHANGES:
- 
-        - The oci8.event and oci8.connection_class values are now shown
-          only when the Oracle client libraries support the respective
-          functionality.
- 
-        - Connection statistics are now in a separate phpinfo() table.
- 
-        - Temporary LOB and Collection support status lines in
-          phpinfo() were removed.  These features have always been
-          enabled since 2007.
- 
-      - OCI_INTERNAL_DEBUG() CHANGES:
- 
-        - The oci_internal_debug() function is now a no-op.  Use PHP's
-          --enable-dtrace functionality with DTrace or SystemTap instead.
- 
-    - INTERNAL CHANGES:
- 
-      - Fixed a potential NULL pointer dereference flagged by Parfait
-        static code analysis.
- 
-      - Extended testing of existing OCI8 functionality.
- 
-      - Improved test output portability when using the PHP development
-        web server to run tests.
- 
-      - Removed no-longer necessary Unicode patterns from tests
-        (vestiges of PHP's previous PHP 6 project)
-        
-      - Improved build portability by removing compilation type cast
-        warnings with some compilers.
- 
-      - Fixed compilation warnings when building with Oracle 9.2
-        client libraries.
- 
-      - Updated code to use internal macro PHP_OCI_REGISTER_RESOURCE.
- 
-      - Regularized code prototypes and fixed some in-line documentation
-        prototypes.
- 
-      - Fixed code folding. 
-   </notes>
+    - Fix --enable-maintainer-zts mode
+  </notes>
  <contents>
   <dir name="/">
    <dir name="tests">
@@ -514,6 +452,84 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+
+<release>
+  <version>
+   <release>2.0.0</release>
+   <api>2.0.0</api>
+  </version>
+  <stability>
+   <release>devel</release>
+   <api>devel</api>
+  </stability>
+  <license uri="http://www.php.net/license">PHP</license>
+  <notes> 
+    - NEW FUNCTIONALITY:
+ 
+      - Added Implicit Result Set support for Oracle Database 12c.
+       Streaming of all IRS's returned from a PL/SQL block is available
+       via oci_fetch_array, oci_fetch_assoc, oci_fetch_object and
+       oci_fetch_row (but not oci_fetch or oci_fetch_all).
+       Alternatively individual IRS statement resources can be obtained
+       with the new function 'oci_get_implicit_resultset' and passed to
+       any oci_fetch_* function.
+
+      - Added DTrace probes enabled with PHP's generic --enable-dtrace
+
+    - IMPROVED FUNCTIONALITY:
+ 
+      - Using 'oci_execute($s, OCI_NO_AUTO_COMMIT)' for a SELECT no
+       longer unnecessarily initiates an internal ROLLBACK during
+       connection close.  This can improve overall scalability by
+       reducing "round trips" between PHP and the database.
+ 
+    - CHANGED FUNCTIONALITY:
+ 
+      - PHPINFO() CHANGES:
+ 
+        - The oci8.event and oci8.connection_class values are now shown
+          only when the Oracle client libraries support the respective
+          functionality.
+ 
+        - Connection statistics are now in a separate phpinfo() table.
+ 
+        - Temporary LOB and Collection support status lines in
+          phpinfo() were removed.  These features have always been
+          enabled since 2007.
+ 
+      - OCI_INTERNAL_DEBUG() CHANGES:
+ 
+        - The oci_internal_debug() function is now a no-op.  Use PHP's
+          --enable-dtrace functionality with DTrace or SystemTap instead.
+ 
+    - INTERNAL CHANGES:
+ 
+      - Fixed a potential NULL pointer dereference flagged by Parfait
+        static code analysis.
+ 
+      - Extended testing of existing OCI8 functionality.
+ 
+      - Improved test output portability when using the PHP development
+        web server to run tests.
+ 
+      - Removed no-longer necessary Unicode patterns from tests
+        (vestiges of PHP's previous PHP 6 project)
+        
+      - Improved build portability by removing compilation type cast
+        warnings with some compilers.
+ 
+      - Fixed compilation warnings when building with Oracle 9.2
+        client libraries.
+ 
+      - Updated code to use internal macro PHP_OCI_REGISTER_RESOURCE.
+ 
+      - Regularized code prototypes and fixed some in-line documentation
+        prototypes.
+ 
+      - Fixed code folding. 
+  </notes>
+</release>
+
 <release>
  <version>
   <release>1.4.10</release>

diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index d1fe0877924e02aa457964733d586d9485e1bc69..f10f01db52d428aa5735d1dc59107bcf3ca74ee9 100644 (file)
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.0.0-dev"
+#define PHP_OCI8_VERSION "2.0.1-dev"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry