diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-06-25 18:01:46 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-06-25 18:01:46 -0300 |
| commit | 2ab53f4b5e00d9291bdaa5df84c17e6b8c22e40f (patch) | |
| tree | 3cb076bef4e8dfa33a47533c57702bf58012a08c | |
| parent | 41b73e4cee9ce68b8b78a00eddd4322b0d48dd06 (diff) | |
| parent | 5d0094e5f9f8bd49c615f2ec2542384f802d340d (diff) | |
| download | php-git-2ab53f4b5e00d9291bdaa5df84c17e6b8c22e40f.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
| -rwxr-xr-x | ext/pdo_oci/config.m4 | 4 | ||||
| -rw-r--r-- | ext/pdo_oci/tests/pdo_oci_attr_client.phpt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 309bde8a5f..0e42d1f9a9 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -2,7 +2,7 @@ dnl $Id$ dnl config.m4 for extension pdo_oci dnl vim:et:sw=2:ts=2: -SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and 11.1 installs +SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when the DB version is bumped AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) for OCI_VER in $SUPPORTED_LIB_VERS; do @@ -147,7 +147,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_ fi case $PDO_OCI_VERSION in - 9.0|10.1|10.2|11.1|11.2) + 9.0|10.1|10.2|11.1|11.2|12.1) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt index 372ccec8e1..eadb028e0f 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt @@ -18,7 +18,7 @@ $cv = $dbh->getAttribute(PDO::ATTR_CLIENT_VERSION); var_dump($cv); $s = explode(".", $cv); -if ($s[0] >= 10 && count($s) > 1 && $s[1] >= 2) { +if (count($s) > 1 && (($s[0] == 10 && $s[1] >= 2) || $s[0] >= 11)) { if (count($s) != 5) { echo "Wrong number of values in array\nVersion was: "; var_dump($cv); |