summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/oci8/package.xml9
-rw-r--r--ext/oci8/php_oci8.h5
2 files changed, 6 insertions, 8 deletions
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 7eccd9d8f9..1ef8f1fd85 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -58,13 +58,12 @@ libraries are available.
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
-Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
-client library 10.2 (Note this will connect to Oracle Database 8.1.7
-onwards). Use the older OCI8 1.4 if an earlier PHP version or older
-Oracle client library support is necessary.
+Bump PHP OCI8 2.0 mininum requirements to PHP 5.2 and Oracle client
+library 10.2. (Use OCI8 1.4 for older PHP version support or if only
+Oracle 9.2 client libraries are available.)
Re-enable php_oci8.dll and php_oci8_11g.dll for Windows builds so URL
-linking works in the new Windows PECL infrastructure.
+links work in the new Windows PECL infrastructure.
</notes>
<contents>
<dir name="/">
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 1ea0411073..ee8d831221 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -41,12 +41,11 @@
*/
#ifdef PHP_OCI8_VERSION
/* The definition of PHP_OCI8_VERSION changed in PHP 5.3 and building
- * this code with PHP 5.2 and earlier (e.g. when using OCI8 from PECL)
- * will conflict.
+ * this code with PHP 5.2 (e.g. when using OCI8 from PECL) will conflict.
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "2.0.5-dev"
+#define PHP_OCI8_VERSION "2.0.5"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry