This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 3f3b87a67 Remove outdated mentions of Apache 1.3
3f3b87a67 is described below
commit 3f3b87a6713d7b594e3ef9eb9154fe3772969817
Author: Rainer Jung <[email protected]>
AuthorDate: Wed Jun 24 18:56:09 2026 +0200
Remove outdated mentions of Apache 1.3
---
native/BUILDING.txt | 9 +--
native/common/jk_logger.h | 3 -
native/common/jk_service.h | 2 +-
native/common/list.mk.in | 2 +-
native/configure.ac | 46 +------------
tools/dist/binaries/windows/README.html | 3 +-
tools/jkbindist.sh | 2 +-
tools/jkrelease.sh | 2 +-
xdocs/miscellaneous/faq.xml | 117 ++++----------------------------
xdocs/webserver_howto/apache.xml | 13 +---
10 files changed, 23 insertions(+), 176 deletions(-)
diff --git a/native/BUILDING.txt b/native/BUILDING.txt
index c8c79e5ef..5f92ec974 100644
--- a/native/BUILDING.txt
+++ b/native/BUILDING.txt
@@ -57,20 +57,15 @@
FILE is the location of the apxs tool. Default is finding apxs in PATH.
It builds a shared Apache module. It detects automatically the Apache
- version. (2.x and 1.3)
+ version.
--with-apache=DIR
DIR is the path where apache sources are located.
The apache sources should have been configured before configuring mod_jk.
- DIR is something like: /home/apache/apache_1.3.19
+ DIR is something like: /home/apache/apache_2.4.68
It builds a static Apache module.
- --enable-EAPI
- This parameter is needed when using Apache 1.3 and mod_ssl, otherwise you
- will get the error message: "this module might crash under EAPI!" when
- loading libjk.so in httpd.
-
Static build needs more tests, and we strongly recommend dynamic build
using DSO/APXS.
diff --git a/native/common/jk_logger.h b/native/common/jk_logger.h
index 73b25280d..a96d42faa 100644
--- a/native/common/jk_logger.h
+++ b/native/common/jk_logger.h
@@ -52,10 +52,7 @@ typedef struct jk_file_logger_t jk_file_logger_t;
struct jk_file_logger_t
{
FILE *logfile;
- /* For Apache 2 APR piped logging */
void *jklogfp;
- /* For Apache 1.3 piped logging */
- int log_fd;
int is_piped;
};
diff --git a/native/common/jk_service.h b/native/common/jk_service.h
index 103b321e5..d0c887c23 100644
--- a/native/common/jk_service.h
+++ b/native/common/jk_service.h
@@ -134,7 +134,7 @@ typedef struct svc_extension svc_extension_t;
* seeing the internal vtables of your favorite OO language. Whatever
* works for you.
*
- * See apache1.3/mod_jk.c and iis/jk_isapi_plugin.c for examples.
+ * See apache2.0/mod_jk.c and iis/jk_isapi_plugin.c for examples.
*/
struct jk_ws_service
{
diff --git a/native/common/list.mk.in b/native/common/list.mk.in
index 098bc0722..c0535a917 100644
--- a/native/common/list.mk.in
+++ b/native/common/list.mk.in
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-## Object needed for mod_jk for Apache-1.3
+## Objects needed for mod_jk for Apache-2.0
APACHE_OBJECTS= ${JK}jk_ajp12_worker${OEXT} ${JK}jk_connect${OEXT} \
${JK}jk_msg_buff${OEXT} ${JK}jk_util${OEXT} \
${JK}jk_ajp13${OEXT} ${JK}jk_pool${OEXT} \
diff --git a/native/configure.ac b/native/configure.ac
index fcf4ea02b..5605f59ba 100644
--- a/native/configure.ac
+++ b/native/configure.ac
@@ -495,36 +495,7 @@ to the Apache source directory.])],
if ${TEST} -n "${withval}" && ${TEST} -d "${withval}" ; then
if ${TEST} -d "${withval}/src" ; then
- # handle the case where people use relative paths to
- # the apache source directory by pre-pending the current
- # build directory to the path. there are probably
- # errors with this if configure is run while in a
- # different directory than what you are in at the time
- if ${TEST} -n "`${ECHO} ${withval}|${GREP} \"^\.\.\"`" ; then
- withval=`pwd`/${withval}
- fi
-
- apache_dir=${withval}
- apache_dir_is_src="true"
- AC_MSG_RESULT(${apache_dir})
-
- AC_MSG_CHECKING(for Apache include directory)
-
- if ${TEST} -d "${withval}/src/include" ; then
- # read osdir from the existing apache.
- osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config |
${SED} -e 's:^OSDIR=.*/os:os:'`
- if ${TEST} -z "${osdir}" ; then
- osdir=os/unix
- fi
- apache_include="-I${withval}/src/include \
- -I${withval}/src/${osdir}"
- WEBSERVER="apache-1.3"
- LIB_JK_TYPE=mod_jk.a
- CFLAGS="${CFLAGS} -DJK_PREFORK"
- AC_MSG_RESULT([${apache_include}, version 1.3])
- else
- AC_MSG_ERROR([Sorry Apache 1.2.x is no longer supported.])
- fi
+ AC_MSG_ERROR([Sorry Apache 1.3.x is no longer supported.])
else
if ${TEST} -d "${withval}/include" ; then
# osdir for Apache20.
@@ -558,21 +529,6 @@ AC_SUBST(apache_include)
APACHE_DIR=${apache_dir}
AC_SUBST(APACHE_DIR)
-dnl CFLAGS for EAPI mod_ssl (Apache 1.3)
-dnl it also allows the CFLAGS environment variable.
-CFLAGS="${CFLAGS}"
-AC_ARG_ENABLE(EAPI,
-[AS_HELP_STRING([--enable-EAPI],[Enable EAPI support (mod_ssl, Apache 1.3)])],
-[
-case "${enableval}" in
- y | Y | YES | yes | TRUE | true )
- CFLAGS="${CFLAGS} -DEAPI"
- AC_MSG_RESULT([...Enabling EAPI Support...])
- ;;
-esac
-])
-AC_SUBST(CFLAGS)
-
dnl CFLAGS for maintainer mode
dnl it also allows the CFLAGS environment variable.
CFLAGS="${CFLAGS}"
diff --git a/tools/dist/binaries/windows/README.html
b/tools/dist/binaries/windows/README.html
index 16a5923c0..64747d5fd 100644
--- a/tools/dist/binaries/windows/README.html
+++ b/tools/dist/binaries/windows/README.html
@@ -47,6 +47,5 @@ for the complete list of features and bugs fixed in this
release.</p>
contains <strong>only</strong> source and build files, and contains
<strong>no</strong> binary executable files.</p>
-<p>This binary release was created with Microsoft Windows DDK 7.1,
- using a more recent Platform SDK.
+<p>This binary release was created with a recent version of Microsoft Windows
Visual Studio.
</p>
diff --git a/tools/jkbindist.sh b/tools/jkbindist.sh
index 0cab7d931..81b1c72ce 100755
--- a/tools/jkbindist.sh
+++ b/tools/jkbindist.sh
@@ -86,7 +86,7 @@ case "$websrv" in
;;
*)
echo "Unknown web server: $webserv"
- echo " Supported are: httpd, iis, nsapi"
+ echo " Supported are: httpd, iis"
;;
esac
diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index c1f717691..c2a2de212 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -33,7 +33,7 @@ JK_OWNER="root"
JK_GROUP="bin"
JK_TOOLS="`pwd`"
-COPY_JK="README.txt HOWTO-RELEASE.txt .gitignore native jkstatus support tools
xdocs"
+COPY_JK="README.txt HOWTO-RELEASE.txt .gitignore native tools xdocs"
COPY_NATIVE="LICENSE NOTICE"
COPY_BUILD="docs"
COPY_CONF="httpd-jk.conf uriworkermap.properties workers.properties"
diff --git a/xdocs/miscellaneous/faq.xml b/xdocs/miscellaneous/faq.xml
index 35f2bbfd7..133aa8b88 100644
--- a/xdocs/miscellaneous/faq.xml
+++ b/xdocs/miscellaneous/faq.xml
@@ -112,10 +112,10 @@ You could also try searching the mailing list archives
for "JK" or look at the s
<p>
<a href="../ajp/ajpv13a.html">ajp13</a> is the standard. The old
<strong>ajp12 is deprecated</strong> and <strong>ajp14 is
experimental</strong>.
+Support for ajp12 and ajp14 will be removed soon.
</p>
<p>
-Also ajp13 is supported by all Apache Tomcat versions starting with Tomcat 3.2
-and by other servlet engines like <b>Jetty</b> and <b>JBoss</b>.
+Also ajp13 is supported by all currently supported Apache Tomcat versions.
</p>
</subsection>
@@ -125,10 +125,11 @@ The ajp13 protocol uses persistant connections where the
traffic could be null i
Firewalls use to drop inactive connections and will make your web server and
Tomcat think the connection is valid.
</p>
<p>
-Starting with JK 1.2.0, a <b>socket_keepalive</b> property as been added to
ajp13 settings, and you should take a look at
-it in <a href="../common_howto/workers.html">Workers HowTo</a> and
+You should take a look at the <b>socket_keepalive</b> ajp13 property
+in <a href="../common_howto/workers.html">Workers HowTo</a> and
<a href="../reference/workers.html">workers.properties reference</a>.
-If nothing else helps, you can try <b>JkOptions +DisableReuse</b>, but this
will have strong performance implications.
+If nothing else helps, you can try <b>JkOptions +DisableReuse</b> to disable
persistent connections.
+But this will have severe performance implications.
</p>
</subsection>
@@ -162,66 +163,13 @@ But with very ancient releases of mod_jk, you may have to
restart Apache as well
</p>
</subsection>
-<subsection name="Why do there exist two files mod_jk.so (-eapi ad -noeapi) in
download directories for Apache 1.3?">
-<p>
-Many versions of Apache use a modified API, known at Extended API, developed
for use with the
-<a href="http://www.modssl.org";>mod_ssl module</a>. Starting with Apache 2.0
there is no more difference.
-</p>
-
-<p>
-For example, Apache 1.3 present in certains recent Linux distributions include
the
-<b>mod_ssl</b> module.
-</p>
-
-<p>
-So if you got such 'Extended Apache', you need to use <b>mod_jk.so-eapi</b>.
-</p>
-
-<p>
-You should use <b>mod_jk.so-noeapi</b> only for 'Standard Apache' (ie without
mod_ssl).
-</p>
-
-<p>
-It's wise to avoid using EAPI modules on STD API Apache or to use standard API
modules on EAPI Apache.
-Allways be sure to have the <b>mod_jk.so</b> which match your version of
Apache.
-</p>
-</subsection>
-
-<subsection name="What's that message about 'garbled DSO ?'">
-<p>
-It's related to Apache EAPI, the message <code>'mod_jk.so is garbled - perhaps
this is not an Apache module DSO ?'</code>
-just told you, that your're trying to install a mod_jk.so DSO module that was
compiled on an Apache using EAPI,
-like apache-mod_ssl or apache from Redhat distro 6.2/7.0 but your system use
the standard Apache with normal API.
-</p>
-</subsection>
-
-<subsection name="And the message about 'module might crash under EAPI!">
-<p>
-Also related to EAPI, the message <code>'[warn] Loaded DSO
/usr/lib/apache/mod_jk.so uses plain Apache 1.3 API,
-this module might crash under EAPI! (please recompile it with -DEAPI)'</code>,
the mod_jk.so was compiled under normal
-Apache with standard API and you try to install the module on an Apache using
EAPI.
-</p>
-</subsection>
-
<subsection name="APXS is getting an error during the build of mod_jk, like
rc=0 or rc=255. I tried all of the steps in the build section, what do I do
now ?">
<p>
-APXS is a Perl script that is created when you build the Apache web server
from source.
-Chances are that if you are getting these errors and you obtained Apache as a
binary distribution,
-that APXS is not configured correctly for your system.
-Your best bet is to get the Apache source from the <a
href="http://httpd.apache.org/";>Apache HTTP Server homepage</a> and build it
yourself.
-Use the following for a basic build (read the Apache docs for other options):
-<source>[user@host] ~ $ cd /usr/local/src
-[user@host] ~ $ gzip -dc apache_1.3.19.tar.gz|tar xvf -
-[user@host] ~ $ cd apache_1.3.19
-[user@host] ~ $ ./configure --prefix=/usr/local/apache \
- --enable-module=most \
- --enable-shared=max
-[user@host] ~ $ make
-[user@host] ~ $ make install
-</source>
-</p>
-<p>
-Note: The above steps assume that you downloaded the Apache source and placed
it in your /usr/local/src directory.
+APXS is a Perl script that is created when you build the Apache web server
from source.
+When installing Apache from Linux distribution packages, apxs is often part
+of a dev or devel package. Sometimes it is named apxs2.
+If you are getting these errors your apxs or apxs might come from
+other sources than your installed Apache web server.
</p>
</subsection>
@@ -255,50 +203,9 @@ all features of mod_jk, but on the other hand you get the
modules automatically
</p>
</subsection>
-<subsection name="JNI doesn't work with Apache 1.3">
-<warn>JNI workers have been deprecated. They will likely not work. Do not use
them.</warn>
-<p>
-JNI support requires a multi-threaded environment which is not the general
case for Apache 1.3.
-You should verify if Apache 1.3 has been build with thread support and if not
you could add the
-the pthreads library to your <b>httpd.conf</b> file.
-</p>
-
-<source># Add pthread to Apache in httpd.conf
-LoadModule "/usr/lib/libpthreads.so"
-</source>
-
-<p>
-Also keep in mind that JNI is suited for multi-threaded servers and you should
consider upgrading
-to Apache 2.x to support JNI.
-</p>
-</subsection>
-
-<subsection name="JNI report that JVM couldn't be started under Linux">
-<warn>JNI workers have been deprecated. They will likely not work. Do not use
them.</warn>
-<p>
-Under Linux, you should set some environment variables BEFORE launching your
Apache HTTP Server:
-</p>
-
-<source>export LD_LIBRARY_PATH=$jre/bin:$jre/bin/classic:$LD_LIBRARY_PATH
-</source>
-
-<p>
-Also some Linux distributions have enabled a GLIBC feature called 'floating
stacks' which may not works with kernel
-less than 2.4.10 on SMP machines. You should disable floating stacks by
exporting an environment variable:
-</p>
-
-<source>export LD_ASSUME_KERNEL=2.2.5
-</source>
-
-<p>
-You could have to update your service scripts, ie
<b>/etc/rc.d/init.d/httpd</b>, to set these env vars
-before your Apache server starts.
-</p>
-</subsection>
-
<subsection name="Mixed errors when building via configure">
<p>
-configure assume you have some GNU tools already installed and configured for
your system, and ad minima <b>libtool</b>.
+configure assume you have some GNU tools already installed and configured for
your system, and at least <b>libtool</b>.
</p>
<p>
Also some systems may have mixed cc and gcc setup which may make you puzzled
when trying to link an Apache built with native
diff --git a/xdocs/webserver_howto/apache.xml b/xdocs/webserver_howto/apache.xml
index 22d0bbedd..2af56b19a 100644
--- a/xdocs/webserver_howto/apache.xml
+++ b/xdocs/webserver_howto/apache.xml
@@ -854,20 +854,14 @@ Start over with the apxs location for your next Apache
HTTP Server version.
<tr valign="top">
<td>--with-apxs[=FILE]</td>
<td>FILE is the location of the apxs tool. Default is finding apxs in PATH.
-It builds a shared Apache module. It detects automatically the Apache version.
-(2.x and 1.3)</td>
+It builds a shared Apache module. It detects automatically the Apache
version.</td>
</tr>
<tr valign="top"><td>--with-apache=DIR</td>
<td>DIR is the path where Apache sources are located.
The Apache sources should have been configured before configuring mod_jk.
-DIR is something like: /home/apache/apache_1.3.19
+DIR is something like: /home/apache/apache_2.4.68
It builds a static Apache module.</td>
</tr>
- <tr valign="top"><td>--enable-EAPI</td>
- <td>This parameter is needed when using Apache-1.3 and mod_ssl, otherwise
you will get the error message:
-"this module might crash under EAPI!" when loading mod_jk.so in Apache.
-Not needed when --with-apxs has been used</td>
-</tr>
<tr valign="top"><td>--enable-prefork</td>
<td>
In case you build mod_jk for a multi-threaded Apache HTTP Server 2.x MPM
(Multi-Processing Module),
@@ -876,8 +870,7 @@ Because configure can not easily detect, whether your are
using a multi-threaded
mod_jk by default is always build thread-safe for Apache HTTP Server 2.x.
If you are sure, that your MPM is not multi-threaded, you can use
"--enable-prefork"
to force the removal of the synchronisation code (thus increasing performance
a bit).
-For instance, the prefork MPM is not multi-threaded. For Apache HTTP Server 1.3
-this flag will be set automatically.</td>
+For instance, the prefork MPM is not multi-threaded.</td>
</tr>
<tr valign="top"><td>--disable-trace</td>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
