summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2016-08-18 13:52:56 +1000
committerChristopher Jones <sixd@php.net>2016-08-18 13:52:56 +1000
commitfe3e330c2e1e33116adb5a75d980b9c2c8fa28e5 (patch)
treeaa2250986a06304c0b5bf6d0fe4e2632a46b3ded
parent2103e9f21f17826c613df3f4af4283947afc5574 (diff)
parent7ed2602af86d630cd6fec481b7de0c346e24bb3d (diff)
downloadphp-git-fe3e330c2e1e33116adb5a75d980b9c2c8fa28e5.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r--ext/oci8/README10
-rw-r--r--ext/oci8/package.xml10
2 files changed, 9 insertions, 11 deletions
diff --git a/ext/oci8/README b/ext/oci8/README
index 42833e27c0..5d1743dfce 100644
--- a/ext/oci8/README
+++ b/ext/oci8/README
@@ -5,15 +5,13 @@ Use the OCI8 extension to access Oracle Database.
Documentation is at http://php.net/oci8
-PHP OCI8 2.1 builds with PHP 7.
+Use 'pecl install oci8' to install for PHP 7.
-Use 'pecl install oci8' to install OCI8 for PHP 7.
+Use 'pecl install oci8-2.0.12' to install for PHP 5.2 - PHP 5.6.
-Use 'pecl install oci8-2.0.10' to install OCI8 for PHP 5.2 - PHP 5.6.
+Use 'pecl install oci8-1.4.10' to install for PHP 4.3.9 - PHP 5.1.
-Use 'pecl install oci8-1.4.10' to install OCI8 for PHP 4.3.9 - PHP 5.1.
-
-The OCI8 extension needs to be linked with Oracle 12.1, 11, or 10.2
+The OCI8 extension needs to be linked with Oracle 12, 11, or 10.2
client libraries. These libraries are found in your database
installation, or in the free Oracle Instant Client from
http://www.oracle.com/technetwork/database/features/instant-client/
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index bd57b9bcda..29b5d6db0b 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -8,10 +8,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
<summary>Extension for Oracle Database</summary>
<description>
-Use the OCI8 extension to access Oracle Database. PHP OCI8 2.1 builds
-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
+Use the OCI8 extension to access Oracle Database. Use 'pecl install
+oci8' to install for PHP 7. Use 'pecl install oci8-2.0.12' to install
+for PHP 5.2 - PHP 5.6. Use 'pecl install oci8-1.4.10' to install 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
libraries are found in your database installation, or in the free
Oracle Instant Client from
@@ -46,7 +46,7 @@ Interoperability Support" (ID 207303.1) for details.
<active>no</active>
</lead>
- <date>2016-08-07</date>
+ <date>2016-08-18</date>
<time>12:00:00</time>
<version>