archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Oracle Client 10g is no longer supported

Browse source 
Thus, we drop respective config option for Windows.
This commit is contained in:
Christoph M. Becker 2021-12-12 12:31:07 +01:00
parent 38460c2c94
commit 30a3280df7
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 7 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -13,6 +13,8 @@ PHP NEWS
- OCI8: - OCI8:
. Added oci8.prefetch_lob_size directive to tune LOB query performance . Added oci8.prefetch_lob_size directive to tune LOB query performance
. Support for building against Oracle Client libraries 10.1 and 10.2 has been
dropped. Oracle Client libraries 11.2 or newer are now required.
- Standard: - Standard:
. net_get_interfaces() also reports wireless network interfaces on Windows. . net_get_interfaces() also reports wireless network interfaces on Windows.

5
UPGRADING
View file

@ -157,6 +157,11 @@ PHP 8.2 UPGRADE NOTES
. Windows specific error messages are no longer localized, but instead in . Windows specific error messages are no longer localized, but instead in
English to better match PHP error messages. English to better match PHP error messages.
- OCI8:
. Since building against Oracle Client 10g is no longer supported anyway,
the configuration option --with-oci8 has been dropped. --with-oci8-11g,
--with-oci8-12c and --with-oci8-19 are still supported.
======================================== ========================================
13. Other Changes 13. Other Changes
======================================== ========================================

56
ext/oci8/config.w32
View file

@ -1,19 +1,5 @@
// vim:ft=javascript // vim:ft=javascript
if (PHP_OCI8 != "no" && PHP_OCI8_11G != "no") {
if (!PHP_OCI8_SHARED && !PHP_OCI8_11G_SHARED) {
WARNING("oci8 and oci8-11g provide the same extension and cannot both be built statically");
PHP_OCI8 = "no"
}
}
if (PHP_OCI8 != "no" && PHP_OCI8_12C != "no") {
if (!PHP_OCI8_SHARED && !PHP_OCI8_12C_SHARED) {
WARNING("oci8 and oci8-12c provide the same extension and cannot both be built statically");
PHP_OCI8 = "no"
}
}
if (PHP_OCI8_11G != "no" && PHP_OCI8_12C != "no") { if (PHP_OCI8_11G != "no" && PHP_OCI8_12C != "no") {
if (!PHP_OCI8_11G_SHARED && !PHP_OCI8_12C_SHARED) { if (!PHP_OCI8_11G_SHARED && !PHP_OCI8_12C_SHARED) {
WARNING("oci8-11g and oci8-12c provide the same extension and cannot both be built statically"); WARNING("oci8-11g and oci8-12c provide the same extension and cannot both be built statically");
@ -21,13 +7,6 @@ if (PHP_OCI8_11G != "no" && PHP_OCI8_12C != "no") {
} }
} }
if (PHP_OCI8 != "no" && PHP_OCI8_19 != "no") {
if (!PHP_OCI8_SHARED && !PHP_OCI8_19_SHARED) {
WARNING("oci8 and oci8-19 provide the same extension and cannot both be built statically");
PHP_OCI8 = "no"
}
}
if (PHP_OCI8_11G != "no" && PHP_OCI8_19 != "no") { if (PHP_OCI8_11G != "no" && PHP_OCI8_19 != "no") {
if (!PHP_OCI8_11G_SHARED && !PHP_OCI8_19_SHARED) { if (!PHP_OCI8_11G_SHARED && !PHP_OCI8_19_SHARED) {
WARNING("oci8-11g and oci8-19 provide the same extension and cannot both be built statically"); WARNING("oci8-11g and oci8-19 provide the same extension and cannot both be built statically");
@ -42,41 +21,6 @@ if (PHP_OCI8_12C != "no" && PHP_OCI8_19 != "no") {
} }
} }
ARG_WITH("oci8", "OCI8 support", "no");
if (PHP_OCI8 != "no") {
oci8_dirs = new Array(
PHP_OCI8
);
oci8_lib_paths = "";
oci8_inc_paths = "";
// find the Oracle install
for (i = 0; i < oci8_dirs.length; i++) {
oci8_lib_paths += oci8_dirs[i] + "\\lib;";
oci8_lib_paths += oci8_dirs[i] + "\\lib\\msvc;";
oci8_inc_paths += oci8_dirs[i] + "\\include;";
}
oci8_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;"
oci8_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;";
if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8", oci8_inc_paths) &&
CHECK_LIB("oci.lib", "oci8", oci8_lib_paths))
{
EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c');
AC_DEFINE('HAVE_OCI8', 1);
AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
} else {
WARNING("oci8 not enabled: Oracle Database client libraries or Oracle 10g Instant Client not found");
PHP_OCI8 = "no"
}
}
ARG_WITH("oci8-11g", "OCI8 support using Oracle 11g Instant Client", "no"); ARG_WITH("oci8-11g", "OCI8 support using Oracle 11g Instant Client", "no");
if (PHP_OCI8_11G != "no") { if (PHP_OCI8_11G != "no") {