Skip to content

Commit 30a3280

Browse files
committed
Oracle Client 10g is no longer supported
Thus, we drop respective config option for Windows.
1 parent 38460c2 commit 30a3280

File tree

3 files changed

+7
-56
lines changed

3 files changed

+7
-56
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ PHP NEWS
1313

1414
- OCI8:
1515
. Added oci8.prefetch_lob_size directive to tune LOB query performance
16+
. Support for building against Oracle Client libraries 10.1 and 10.2 has been
17+
dropped. Oracle Client libraries 11.2 or newer are now required.
1618

1719
- Standard:
1820
. net_get_interfaces() also reports wireless network interfaces on Windows.

UPGRADING

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ PHP 8.2 UPGRADE NOTES
157157
. Windows specific error messages are no longer localized, but instead in
158158
English to better match PHP error messages.
159159

160+
- OCI8:
161+
. Since building against Oracle Client 10g is no longer supported anyway,
162+
the configuration option --with-oci8 has been dropped. --with-oci8-11g,
163+
--with-oci8-12c and --with-oci8-19 are still supported.
164+
160165
========================================
161166
13. Other Changes
162167
========================================

ext/oci8/config.w32

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,12 @@
11
// vim:ft=javascript
22

3-
if (PHP_OCI8 != "no" && PHP_OCI8_11G != "no") {
4-
if (!PHP_OCI8_SHARED && !PHP_OCI8_11G_SHARED) {
5-
WARNING("oci8 and oci8-11g provide the same extension and cannot both be built statically");
6-
PHP_OCI8 = "no"
7-
}
8-
}
9-
10-
if (PHP_OCI8 != "no" && PHP_OCI8_12C != "no") {
11-
if (!PHP_OCI8_SHARED && !PHP_OCI8_12C_SHARED) {
12-
WARNING("oci8 and oci8-12c provide the same extension and cannot both be built statically");
13-
PHP_OCI8 = "no"
14-
}
15-
}
16-
173
if (PHP_OCI8_11G != "no" && PHP_OCI8_12C != "no") {
184
if (!PHP_OCI8_11G_SHARED && !PHP_OCI8_12C_SHARED) {
195
WARNING("oci8-11g and oci8-12c provide the same extension and cannot both be built statically");
206
PHP_OCI8_11G = "no"
217
}
228
}
239

24-
if (PHP_OCI8 != "no" && PHP_OCI8_19 != "no") {
25-
if (!PHP_OCI8_SHARED && !PHP_OCI8_19_SHARED) {
26-
WARNING("oci8 and oci8-19 provide the same extension and cannot both be built statically");
27-
PHP_OCI8 = "no"
28-
}
29-
}
30-
3110
if (PHP_OCI8_11G != "no" && PHP_OCI8_19 != "no") {
3211
if (!PHP_OCI8_11G_SHARED && !PHP_OCI8_19_SHARED) {
3312
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") {
4221
}
4322
}
4423

45-
ARG_WITH("oci8", "OCI8 support", "no");
46-
47-
if (PHP_OCI8 != "no") {
48-
49-
oci8_dirs = new Array(
50-
PHP_OCI8
51-
);
52-
53-
oci8_lib_paths = "";
54-
oci8_inc_paths = "";
55-
56-
// find the Oracle install
57-
for (i = 0; i < oci8_dirs.length; i++) {
58-
oci8_lib_paths += oci8_dirs[i] + "\\lib;";
59-
oci8_lib_paths += oci8_dirs[i] + "\\lib\\msvc;";
60-
oci8_inc_paths += oci8_dirs[i] + "\\include;";
61-
}
62-
63-
oci8_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;"
64-
oci8_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;";
65-
66-
if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8", oci8_inc_paths) &&
67-
CHECK_LIB("oci.lib", "oci8", oci8_lib_paths))
68-
{
69-
EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c');
70-
71-
AC_DEFINE('HAVE_OCI8', 1);
72-
AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
73-
74-
} else {
75-
WARNING("oci8 not enabled: Oracle Database client libraries or Oracle 10g Instant Client not found");
76-
PHP_OCI8 = "no"
77-
}
78-
}
79-
8024
ARG_WITH("oci8-11g", "OCI8 support using Oracle 11g Instant Client", "no");
8125

8226
if (PHP_OCI8_11G != "no") {

0 commit comments

Comments
 (0)