cvs commit: jakarta-tomcat-connectors KEYS
truk2004/03/26 14:07:06 Modified:.KEYS Log: Switch to a non-patented algorithm. Revision ChangesPath 1.14 +27 -9 jakarta-tomcat-connectors/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-connectors/KEYS,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- KEYS 30 Jan 2004 21:54:40 - 1.13 +++ KEYS 26 Mar 2004 22:07:06 - 1.14 @@ -259,17 +259,35 @@ -END PGP PUBLIC KEY BLOCK- Type Bits/KeyID Date User ID -pub 1024R/074C5577 2004-01-22 Kurt Miller <[EMAIL PROTECTED]> +pub 1024D/364D8C7E 2004-03-05 Kurt Miller <[EMAIL PROTECTED]> -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.2.2 (OpenBSD) -mQCNA0AP+eEEALgNTbKKzz1eZthGUw8vwBZS/jkodpEKLkGJUyLvCSgb+V7l -cEWqPpOXQOGK7w52sFArx9FtIEq8X2P5WF6UJisEaJoQNS4PCc6KrSSb0BHtMZqO -G+8m9bVeCBPbCQ810oQMOe2LNBZ+uBvIXfzvACN/NrunlrNILsp2j08HTFV3AAUR -tB1LdXJ0IE1pbGxlciA8dHJ1a0BhcGFjaGUub3JnPokAlQMFEEAP+eDKdo9PB0xV -dwEBBCwD+gP3DWtvvVWiSYa8abvlADOQkdK47cBkPk4KuUANHVajkePgtQu0hpkL -LLuO+yjBk34Lke0jYoJWicG3nvRRiZ3GaYEcgsAxysQcqGsocESORVWRB7cxzKiH -sDKQpgzncVh5YbE/YhGs5p2oB/WXCx+9Tpkw5FkD2NtudOfhB5mA -=FtE6 +mQGiBEBIwvcRBACNMkLDqN6defWFQeMEEJxbXhzna7pf5DmcJ5EI2BPc9NRXS9mT +mA9Q1Uy2BeeG2YHrXTPL4H1mHvJQcwg1QFKRFbKgEmeVY9wMvAkne9YrZdqofTD5 +5Z8DbH0uHRcN3DhTuC8rQKJOhHyJuntE2iZAPD6ASYkiPvygEFgB31gTSwCg0OqZ +azyrfopwc2oiqTWaoATGBMkD/1orgI1zD95f5Qu3lSguVcr9pf04BCt+d3Wq/Wc3 +DJ9BeyA2YdeH0LHE7jmwp2j4kzJyROubGGrOaynvZjf+UP1xSetnR0xgj+FQaK5h +xB0rvpv2QJE/aMbQhV+P8Naa9K8yH0YfFTR6X4pSgGBgh+aKCtejrvhySibA5JWQ +peB+A/9CBBNr3V2hN4k3irelWE7jPjHDM2O7s9Mkfr1wsTHxfBNREedgz42pefOz +EDM4C0bMsbdiB9eEKG6y5ozKrUcAWNz/uOrRfWeZ3EmXqs/LBZeKPb6D3XV54qet +nR4P2mAM5XnxXywFda7jm0uBtBNXFJKF93ntvZ9jwflaDUDehbQdS3VydCBNaWxs +ZXIgPHRydWtAYXBhY2hlLm9yZz6IYQQTEQIAIQUCQEjC9wUJA8JnAAYLCQgHAwID +FQIDAxYCAQIeAQIXgAAKCRC5eaEVNk2Mfl6lAJ9ilKDorZG8xCndE9Vl+TFg+vuV ++wCfb1VXPPJeGJFQ5JXcP7neb71ZWzm5Ag0EQEjDChAIAInQdEjA33llK0yok0M2 +ONst7PwXTd50lzY1zvNacjtRw1hOEGWYMuO4TfDCd50foWVSF+XaM36ar8kS571c +Ykye/VrVeXYRZRuBolT4bffz8h0QGTmV25uVp8BOqxjHAQmATTpvpct6RiQPwaxv +cZe6hU7ebYualvmf1N5hHVw8kKM/+BrPl9Q0WYVh/4Qb7Mv5PfNZZbRAHmrmNuzZ +ATNe5D1o6BvIhl3i6DCYRCvKHbyZWBuDcGXZ8IldqouAFbE/iOVfj1GfvDxWQKla +qDQfyfMJ8SMW7oTNDTilnZQpFrRGR9ejxnhYeXDYd9gZdleBjtCcEws1pXBJaDuW +MNsAAwUH/12Y/FoXLT84OK2GXCS7z/FSS8XjTwi8QTB+g0qnQ9HuZ7KAOugCPmu9 +8FVtzrlJ4qSBsD+8czeZyuzvmsB+Sel0qeTltApb+/ZG/KIrM76qdi2xk1Mabb49 +YtbkvnfVpaO8SHgBm86EDKxKMvBlCKdfgS4aqkcjjOfahBXfn0d1EIm7UtLUoAuU +TDG2lihxhDtzeMdM6W3fPjvVTsMoNSw4vyMW2jNwXOEi3ekjsDT37qtjYP7TjmyI +NS20P9dgRQwVpc5IIwNg5CW/xkpYFJtWfXooZiMzXbX6u/zyDQY2dcdPzYJL6iZJ +dnM1e+Z8aB8sNShKAsYxiLqj8qK0/JKITAQYEQIADAUCQEjDCgUJA8JnAAAKCRC5 +eaEVNk2MftEEAKCtCN/jQibduopySodv4eCB/ayr6QCgsks47qwddcpKOjj6t2dE +LlyuImI= +=FGUc -END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 BUILD.txt INSTALL.txt
truk2004/03/22 11:51:43 Modified:jk/native2 BUILD.txt INSTALL.txt Log: Must use absolute path to apr and apr-util source. At this time there isn't an install target, so replace with apxs install. Lots of redundancy between BUILD.txt and INSTALL.txt right now. Revision ChangesPath 1.6 +4 -4 jakarta-tomcat-connectors/jk/native2/BUILD.txt Index: BUILD.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/BUILD.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BUILD.txt 22 Mar 2004 09:27:58 - 1.5 +++ BUILD.txt 22 Mar 2004 19:51:43 - 1.6 @@ -34,8 +34,8 @@ cd jakarta-tomcat-connectors/jk/native2 ./configure --with-apxs=/your/path/to/apxs \ - --with-apr=/your/path/to/apr-source \ - --with-apr-util=/your/path/to/apr-util-source + --with-apr=/absolute/path/to/apr-source \ + --with-apr-util=/absolute/path/to/apr-util-source make cd ../build/jk2/apache13 apxs -n jk2 -i mod_jk2.so @@ -61,9 +61,9 @@ If you want to have PCRE (Perl Compatible Regular Expressions) support for jk2 uri directives, add --with-pcre while configuring. - -Quick informations on building mod_jk2 : + +Quick information on building mod_jk2 : * IIS 1.5 +8 -4 jakarta-tomcat-connectors/jk/native2/INSTALL.txt Index: INSTALL.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/INSTALL.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- INSTALL.txt 22 Mar 2004 11:47:50 - 1.4 +++ INSTALL.txt 22 Mar 2004 19:51:43 - 1.5 @@ -7,11 +7,12 @@ In the following example Apache2 is installed in /usr/local/apache2 and the commands are executed in the - jakarta-tomcat-connectors/native2 directory. + jakarta-tomcat-connectors/jk/native2 directory. $ ./configure --with-apxs2=PREFIX/bin/apxs $ make - $ make install + $ cd ../build/jk2/apache2 + $ PREFIX/bin/apxs -n jk2 -i mod_jk2.so NOTES: * Replace PREFIX with the filesystem path under which Apache should be installed. A typical installation @@ -59,9 +60,12 @@ gtar xvf apr-util-0.9.4.tar.gz Build and install mod_jk2: - $ ./configure --with-apxs=PREFIX/bin/apxs --with-apr=./apr-0.9.4 --with-apr-util=./apr-util-0.9.4 + $ ./configure --with-apxs=PREFIX/bin/apxs \ +--with-apr=/absolute/path/to/apr-0.9.4 \ +--with-apr-util=/absolute/path/to/apr-util-0.9.4 $ make - $ make install + $ cd ../build/jk2/apache13 + $ PREFIX/bin/apxs -n jk2 -i mod_jk2.so Add the following to httpd.conf: LoadModule jk2_module libexec/mod_jk2.so - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
truk2004/03/22 08:28:21
Modified:jk/native2/server/apache2 Makefile.in
jk/support jk_apxs.m4
Log:
Eliminate hardcoded apr-0 lib and determine while configuring.
Helps older apache2 versions.
Revision ChangesPath
1.25 +2 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 19 Mar 2004 02:52:22 - 1.24
+++ Makefile.in 22 Mar 2004 16:28:21 - 1.25
@@ -12,6 +12,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -43,7 +44,7 @@
ifdef APR_LIBDIR_LA
JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+JK_LDFLAGS=-lcrypt ${APR_LIBS} @PCRE_LIBS@
endif
## Based on rules.mk ##
1.15 +11 -2 jakarta-tomcat-connectors/jk/support/jk_apxs.m4
Index: jk_apxs.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_apxs.m424 Feb 2004 08:41:40 - 1.14
+++ jk_apxs.m422 Mar 2004 16:28:21 - 1.15
@@ -95,13 +95,21 @@
APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
JK_CHANNEL_APR_SOCKET="\${JK}jk_channel_apr_socket\${OEXT}"
JK_POOL_APR="\${JK}jk_pool_apr\${OEXT}"
- HAS_APR="-DHAS_APR"
APXS$1_CFLAGS="`${APXS$1} -q CFLAGS` `${APXS$1} -q EXTRA_CFLAGS`"
APXS$1_CPPFLAGS="`${APXS$1} -q EXTRA_CPPFLAGS`"
APR_INCDIR="-I`${APXS$1} -q APR_INCLUDEDIR`"
APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`"
APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`"
LIBTOOL=`${APXS$1} -q LIBTOOL`
+ if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so; then
+APR_LIBS="-L${APACHE2_LIBDIR} -lapr-1"
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so; then
+APR_LIBS="-L${APACHE2_LIBDIR} -lapr-0"
+ elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so; then
+APR_LIBS="-L${APACHE2_LIBDIR} -lapr"
+ else
+AC_MSG_ERROR(can't locate libapr)
+ fi
fi
AC_MSG_RESULT([building connector for \"$RWEBSERVER\"])
@@ -127,6 +135,7 @@
AC_SUBST(APACHE$1_LIBDIR)
AC_SUBST(APACHE$1_CC)
AC_SUBST(APXS$1_LDFLAGS)
+ AC_SUBST(APR_LIBS)
])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
truk2004/03/18 18:52:23
Modified:jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Rearrange Makefile.apxs.in to be more consistant with Makefile.in
Arrange --with-pcre support for apache13 for both Makefile.in and
Makefile.apxs.in
Arrange --with-jni support for apache13 for Makefile.apxs.in
(excluding libjkjni.so)
Slight adjustments to the prepare and clean targets in Makefile.in
Revision ChangesPath
1.11 +16 -11
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.apxs.in 10 Mar 2004 23:52:34 - 1.10
+++ Makefile.apxs.in 19 Mar 2004 02:52:22 - 1.11
@@ -1,4 +1,6 @@
## configure should make the Makefile out of this file.
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -6,30 +8,33 @@
JK_DIR := ../..
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
-
-
-JK=${JK_DIR}/common/
-JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
-APACHE2_OBJECTS=jk_logger_apache2.c jk_map_aprtable.c jk_service_apache2.c
+INCLUDES= -I${JK_DIR}/include \
+ ${JAVA_INCL}
-## Must include the jni stuff
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAVE_JNI@ @HAS_PCRE@
+
+COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
+JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
+A2_C_FILES := $(wildcard *.c )
all: mod_jk2.la
mod_jk2.la:
- $(APXS) -c -o $@ -Wc,"${JK_INCL}" "${JAVA_INCL}" mod_jk2.c ${APACHE2_OBJECTS}
${COMMON_C_FILES}
+ $(APXS) -c -o $@ -Wc,"${INCLUDES} ${JK_CFLAGS}" ${JAVA_LIB} @PCRE_LIBS@ \
+ ${A2_C_FILES} ${COMMON_C_FILES} ${JNI_C_FILES}
install: mod_jk2.la
$(APXS) -i mod_jk2.la
clean:
- rm -f *.o *.so *.lo *.la *.slo
- rm -rf .libs
+ rm -f *.o *.so *.lo *.la *.slo ${JK_DIR}/common/*.o ${JK_DIR}/common/*.so \
+ ${JK_DIR}/common/*.lo ${JK_DIR}/common/*.la ${JK_DIR}/common/*.slo \
+ ${JK_DIR}/jni/*.o ${JK_DIR}/jni/*.so ${JK_DIR}/jni/*.lo \
+ ${JK_DIR}/jni/*.la ${JK_DIR}/jni/*.slo
+ rm -rf .libs ${JK_DIR}/common/.libs ${JK_DIR}/jni/.libs
1.24 +7 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in 12 Mar 2004 08:23:46 - 1.23
+++ Makefile.in 19 Mar 2004 02:52:22 - 1.24
@@ -2,6 +2,8 @@
# use -D options to overrides defaults
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -37,7 +39,7 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAVE_JNI@ @HAS_PCRE@
ifdef APR_LIBDIR_LA
JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
else
@@ -106,13 +108,11 @@
${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so
$(CP) $^ $@
${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so
$(CP) $^ $@
${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
- mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
@@ -124,7 +124,9 @@
${COMMON_C_FILES} ${A2_C_FILES}: ${H_FILES}
prepare:
- mkdir -p ${BUILD_DIR}
+ mkdir -p ${BUILD_DIR}${APACHE2_LIBEXEC}
clean:
- rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
${BUILD_DIR}/*.so
+ rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/*.a \
+ ${BUILD_DIR}/.libs ${BUILD_DIR}/*.so
${BUILD_DIR}${APACHE2_LIBEXEC}/*.so \
+ ${BUI
cvs commit: jakarta-tomcat-connectors/jk/support jk_pcre.m4
truk2004/03/18 14:07:38
Modified:jk/native2/server/apache13 Makefile.apxs.in Makefile.in
jk/support jk_pcre.m4
Log:
Arrange --with-pcre support for apache13 for both Makefile.in and
Makefile.apxs.in
Arrange --with-jni support for apache13 for Makefile.apxs.in
(excluding libjkjni.so)
Slight adjustment to the prepare and clean targets in Makefile.in
Revision ChangesPath
1.11 +13 -6
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.apxs.in 13 Feb 2004 21:38:26 - 1.10
+++ Makefile.apxs.in 18 Mar 2004 22:07:38 - 1.11
@@ -1,27 +1,34 @@
## configure should make the Makefile out of this file.
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
JK_DIR := ../..
-COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
-C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/bin/apr-config --link-ld`
[EMAIL PROTECTED]@/bin/apu-config --link-ld`
ifneq ($(strip $(JAVA_HOME)),)
-JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
+JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
-JK_CFLAGS=-I ${JK_DIR}/include -DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 ${APR_CFLAGS}
-DHAVE_MMAP
+INCLUDES= -I${JK_DIR}/include \
+ ${JAVA_INCL}
+
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 ${APR_CFLAGS} -DHAVE_MMAP @HAVE_JNI@
@HAS_PCRE@
+
+COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
+JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
+C_FILES=jk_service_apache13.c mod_jk2.c
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ ${JK_CFLAGS} ${JAVA_INCL} ${C_FILES} ${COMMON_C_FILES} \
- ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB}
+ $(APXS) -c -o $@ ${INCLUDES} ${JK_CFLAGS} ${C_FILES} ${COMMON_C_FILES}
${JNI_C_FILES} \
+ ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB} @PCRE_LIBS@
install: mod_jk2.so
$(APXS) -i mod_jk2.so
1.16 +7 -6 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 18 Mar 2004 17:14:45 - 1.15
+++ Makefile.in 18 Mar 2004 22:07:38 - 1.16
@@ -2,6 +2,8 @@
# use -D options to overrides defaults
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -29,8 +31,8 @@
${APACHE_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@
-JK_LDFLAGS=${APR_LDFLAGS} ${JAVA_LIB}
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@
@HAS_PCRE@
+JK_LDFLAGS=${APR_LDFLAGS} ${JAVA_LIB} @PCRE_LIBS@
## Based on rules.mk ##
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
@@ -95,14 +97,12 @@
$(CP) $^ $@
${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- mkdir -p ${BUILD_DIR}$(APACHE_LIBEXEC)
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/$(APACHE_LIBEXEC)
${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE_LIBEXEC}/libjkjni.so
$(CP) $^ $@
${BUILD_DIR}/${APACHE_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
- mkdir -p ${BUILD_DIR}/${APACHE_LIBEXEC}
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE_LIBEXEC}
${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
@@ -114,7 +114,8 @@
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
prepare:
- mkdir -p ${BUILD_DIR}
+ mkdir -p ${BUILD_DIR}${APACHE_LIBEXEC}
clean:
- rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
${BUILD_DIR}/*.so
+ rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
\
+ ${BUILD_DIR}/*.so ${BUILD_DIR}${APACHE_LIBEXEC}/*.so
1.5 +2 -2 jakarta-tomcat-connectors/jk/support/jk_pcre.m4
Index: jk_pcre.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_pcre.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_pcre.m424 Feb 2004 08:41:40 - 1.4
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 Makefile.in
truk2004/03/18 09:14:45
Modified:jk/native2/server/apache13 Makefile.in
Log:
Arrange --with-jni build.
Revision ChangesPath
1.15 +27 -7 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 11 Mar 2004 18:09:33 - 1.14
+++ Makefile.in 18 Mar 2004 17:14:45 - 1.15
@@ -6,29 +6,31 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+APACHE_LIBDIR=${APACHE_HOME}/lib
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@/apr-config --ldflags --libs` [EMAIL
PROTECTED]@/apu-config --ldflags --libs`
ifneq ($(strip $(JAVA_HOME)),)
-JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
+JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/apache13
-APACHE_LIBEXEC=${APACHE_HOME}/libexec
top_builddir=../..
[EMAIL PROTECTED]@
# It doesn't hurt if we include all
INCLUDES= -I${JK_DIR}/include \
- ${APACHE_INCL}
+ ${APACHE_INCL} \
+ ${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP ${JAVA_INCL}
-JK_LDFLAGS=-L${APACHE_HOME}/lib ${JAVA_LIB}
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@
+JK_LDFLAGS=${APR_LDFLAGS} ${JAVA_LIB}
## Based on rules.mk ##
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
@@ -51,11 +53,14 @@
# Excludes are not yet implemented.
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
+JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
A_C_FILES := $(wildcard ${JK_DIR}/server/apache13/*.c )
H_FILES := $(wildcard ${JK_DIR}/include/*.h )
COMMON_LO_FILES := $(patsubst ${JK_DIR}/common/%, ${BUILD_DIR}/%, \
$(patsubst %c, %lo, ${COMMON_C_FILES} ))
+JNI_LO_FILES := $(patsubst ${JK_DIR}/jni/%, ${BUILD_DIR}/%, \
+ $(patsubst %c, %lo, ${JNI_C_FILES} ))
A_LO_FILES := $(patsubst ${JK_DIR}/server/apache13/%, ${BUILD_DIR}/%, \
$(patsubst %c, %lo, ${A_C_FILES} ))
@@ -73,13 +78,18 @@
${BUILD_DIR}/%.lo: ${JK_DIR}/common/%.c
${SH_COMPILE} -c $< -o $@
+${BUILD_DIR}/%.lo: ${JK_DIR}/jni/%.c
+ ${SH_COMPILE} -c $< -o $@
+
${BUILD_DIR}/%.lo: ${JK_DIR}/server/apache13/%.c
${SH_COMPILE} -c $< -o $@
# -- Targets
-all: prepare ${BUILD_DIR}/mod_jk2.so
+all: prepare ${BUILD_DIR}/mod_jk2.so @JNI_BUILD@
+
+jni-build: ${BUILD_DIR}/libjkjni.so
${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so
$(CP) $^ $@
@@ -88,7 +98,17 @@
mkdir -p ${BUILD_DIR}$(APACHE_LIBEXEC)
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/$(APACHE_LIBEXEC)
-${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
+${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE_LIBEXEC}/libjkjni.so
+ $(CP) $^ $@
+
+${BUILD_DIR}/${APACHE_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
+ mkdir -p ${BUILD_DIR}/${APACHE_LIBEXEC}
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE_LIBEXEC}
+
+${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
+ $(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
+
+${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${JNI_LO_FILES} ${A_LO_FILES}
${MOD_LINK} -o $@ $^ ${APR_LDFLAGS}
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
truk2004/03/12 12:42:51
Modified:jk/native2/common jk_worker_ajp13.c
Log:
Don't do a prepost check alive if the endpoint is not connected yet (it
always fails). When connecting endpoint do a prepost check alive if
there isn't a connect check alive.
Revision ChangesPath
1.62 +5 -2 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- jk_worker_ajp13.c 1 Mar 2004 09:35:26 - 1.61
+++ jk_worker_ajp13.c 12 Mar 2004 20:42:51 - 1.62
@@ -303,9 +303,12 @@
/** XXX use a 'connected' field */
if( ae->sd == -1 ) ae->sd=0;
-if (ae->worker->connect_timeout != 0 ) {
+if (ae->worker->connect_timeout != 0) {
if (jk2_check_alive(env, ae, ae->worker->connect_timeout) != JK_OK)
return JK_ERR;
+} else if (ae->worker->prepost_timeout != 0) {
+if (jk2_check_alive(env, ae, ae->worker->prepost_timeout) != JK_OK)
+return JK_ERR;
}
/* Check if we must execute a logon after the physical connect */
@@ -569,7 +572,7 @@
s->left_bytes_to_send = s->content_length;
s->content_read=0;
-if (w->prepost_timeout != 0) {
+if (w->prepost_timeout != 0 && e->sd != -1) {
if (jk2_check_alive(env, e, e->worker->prepost_timeout) != JK_OK)
return JK_ERR;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
truk2004/03/10 15:52:34
Modified:jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Go back to using HAS_PCRE to fix libjkjni unresolved references.
This reverts Apache2 back to its original behavior for pcre
(for platforms that use configure). If you want pcre support
then configure with --with-pcre.
Revision ChangesPath
1.10 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 27 Feb 2004 19:14:33 - 1.9
+++ Makefile.apxs.in 10 Mar 2004 23:52:34 - 1.10
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
1.22 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in 10 Mar 2004 19:07:40 - 1.21
+++ Makefile.in 10 Mar 2004 23:52:34 - 1.22
@@ -37,11 +37,11 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
endif
## Based on rules.mk ##
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_java.m4
truk2004/03/10 11:07:41
Modified:jk/native2 configure.in
jk/native2/server/apache2 Makefile.in
jk/support jk_java.m4
Log:
Only build libjkjni.so when --with-jni is specified.
Revision ChangesPath
1.22 +3 -2 jakarta-tomcat-connectors/jk/native2/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in 27 Feb 2004 16:07:39 - 1.21
+++ configure.in 10 Mar 2004 19:07:40 - 1.22
@@ -142,6 +142,7 @@
AC_SUBST(JAVA_PLATFORM)
AC_SUBST(OS)
AC_SUBST(HAVE_JNI)
+AC_SUBST(JNI_BUILD)
AC_SUBST(HAS_PCRE)
AC_SUBST(PCRE_LIBS)
1.21 +3 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.in 27 Feb 2004 19:14:33 - 1.20
+++ Makefile.in 10 Mar 2004 19:07:40 - 1.21
@@ -99,7 +99,9 @@
# -- Targets
-all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/libjkjni.so
+all: prepare ${BUILD_DIR}/mod_jk2.so @JNI_BUILD@
+
+jni-build: ${BUILD_DIR}/libjkjni.so
${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
1.8 +2 -1 jakarta-tomcat-connectors/jk/support/jk_java.m4
Index: jk_java.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_java.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_java.m424 Feb 2004 08:41:40 - 1.7
+++ jk_java.m410 Mar 2004 19:07:41 - 1.8
@@ -43,6 +43,7 @@
if ${TEST} ${use_jni} ; then
HAVE_JNI="-DHAVE_JNI"
+ JNI_BUILD="jni-build"
fi
])
])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_lb.c
truk2004/03/08 15:01:07
Modified:jk/native2/common jk_worker_lb.c
Log:
Fix bug 23483
Only add worker to the workerTable if it is not already there.
Add check for maximum workers too.
Revision ChangesPath
1.38 +21 -5 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_worker_lb.c27 Feb 2004 08:34:18 - 1.37
+++ jk_worker_lb.c8 Mar 2004 23:01:06 - 1.38
@@ -448,7 +448,8 @@
char *name = lb->lbWorkerMap->nameAt( env, lb->lbWorkerMap, i);
jk_worker_t *w= env->getByName( env, name );
int level=0;
-int pos=0;
+int pos;
+int workerCnt;
if( w== NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -463,12 +464,27 @@
/* It's like disabled */
if( level >= JK_LB_LEVELS ) continue;
-pos=lb->workerCnt[level]++;
+/* check if worker is already in the table */
+workerCnt = lb->workerCnt[level];
+for(pos = 0 ; pos < workerCnt ; pos++) {
+if( lb->workerTables[level][pos] == w ) {
+break;
+}
+}
+
+if( pos == workerCnt ) {
+if( pos == JK_LB_MAX_WORKERS ) {
+env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "lb_worker.init(): maximum lb workers reached %s\n",
name);
+continue;
+}
+pos=lb->workerCnt[level]++;
-lb->workerTables[level][pos]=w;
+lb->workerTables[level][pos]=w;
-w->lb_value = w->lb_factor;
-w->in_error_state = JK_FALSE;
+w->lb_value = w->lb_factor;
+w->in_error_state = JK_FALSE;
+}
}
return JK_OK;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_un.c
truk2004/03/05 15:35:52 Modified:jk/native2/common jk_channel_un.c Log: Calculate length for bind() in a portable way that works for sockaddr_un structs with and without sun_len. Revision ChangesPath 1.19 +7 -2 jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c Index: jk_channel_un.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- jk_channel_un.c 24 Feb 2004 08:44:40 - 1.18 +++ jk_channel_un.c 5 Mar 2004 23:35:51 - 1.19 @@ -58,6 +58,12 @@ int listenSocket; } jk_channel_un_private_t; +#ifndef SUN_LEN +/* actual length of an initialized sockaddr_un */ +#define SUN_LEN(su) \ +(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) +#endif + static int JK_METHOD jk2_channel_un_close(jk_env_t *env, jk_channel_t *ch, jk_endpoint_t *endpoint); @@ -162,8 +168,7 @@ rc=bind(socketInfo->listenSocket, (struct sockaddr *)& socketInfo->unix_addr, -strlen( socketInfo->unix_addr.sun_path ) + -sizeof( socketInfo->unix_addr.sun_family) ); +SUN_LEN(&(socketInfo->unix_addr)) ); umask(omask); /* can't fail, so can't clobber errno */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkInputStream.java
truk2004/03/04 21:12:56
Modified:jk/java/org/apache/jk/common JkInputStream.java
Log:
Fix Bugs: 20184 & 24763
- getLen returns the length excluding the header.
Revision ChangesPath
1.15 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java
Index: JkInputStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JkInputStream.java24 Feb 2004 08:48:42 - 1.14
+++ JkInputStream.java5 Mar 2004 05:12:56 - 1.15
@@ -256,7 +256,7 @@
blen=0;
// No data received.
- if( bodyMsg.getLen() <= 4 ) { // just the header
+ if( bodyMsg.getLen() == 0 ) { // just the header
// Don't mark 'end of stream' for the first chunk.
// end_of_stream = true;
return false;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in NWGNUmakefile mod_jk2.dsp
truk2004/02/27 11:14:33
Modified:jk/native2/server/apache2 Makefile.apxs.in Makefile.in
NWGNUmakefile mod_jk2.dsp
Log:
Remove HAS_PCRE and add HAS_AP_PCRE. From Guenter Knauf.
apache2 doesn't need --with-pcre now and is silently ignored.
pcre support is always included for apache2
Revision ChangesPath
1.9 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.8
+++ Makefile.apxs.in 27 Feb 2004 19:14:33 - 1.9
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
1.20 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 24 Feb 2004 04:00:30 - 1.19
+++ Makefile.in 27 Feb 2004 19:14:33 - 1.20
@@ -37,11 +37,11 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
endif
## Based on rules.mk ##
1.2 +1 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile
Index: NWGNUmakefile
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUmakefile 20 Nov 2003 00:26:30 - 1.1
+++ NWGNUmakefile 27 Feb 2004 19:14:33 - 1.2
@@ -59,9 +59,8 @@
-D__NOVELL_LIBC__ \
-D_POSIX_SOURCE \
-DHAS_APR \
+ -DHAS_AP_PCRE \
$(EOLIST)
-
-#-DHAS_PCRE
#
# These flags will be added to the link.opt file
1.8 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp
Index: mod_jk2.dsp
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_jk2.dsp 2 Feb 2004 21:58:55 - 1.7
+++ mod_jk2.dsp 27 Feb 2004 19:14:33 - 1.8
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_AP_PCRE" /FR /YX /FD
/c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc0a /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /G
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c jk_uriMap.c
truk2004/02/27 11:10:07
Modified:jk/native2/common jk_uriEnv.c jk_uriMap.c
Log:
Use apache pcre functions when HAVE_AP_PCRE is defined. From Guenter Knauf.
Revision ChangesPath
1.54 +16 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_uriEnv.c 24 Feb 2004 08:44:40 - 1.53
+++ jk_uriEnv.c 27 Feb 2004 19:10:07 - 1.54
@@ -28,10 +28,14 @@
#include "jk_uriMap.h"
#include "jk_registry.h"
+#ifdef HAS_AP_PCRE
+#include "httpd.h"
+#else
#ifdef HAS_PCRE
#include "pcre.h"
#include "pcreposix.h"
#endif
+#endif
/* return non-zero if pattern has any glob chars in it */
@@ -65,7 +69,7 @@
int pcre = 0;
if (*name == '$') {
-#ifdef HAS_PCRE
+#if defined(HAS_PCRE) || defined(HAS_AP_PCRE)
++name;
uriEnv->uri = uriEnv->pool->pstrdup(env, uriEnv->pool, name);
uriEnv->match_type = MATCH_TYPE_REGEXP;
@@ -73,8 +77,13 @@
"uriEnv.parseName() parsing %s regexp\n",
name);
{
+#ifdef HAS_AP_PCRE
+regex_t *preg = ap_pregcomp((apr_pool_t *)uriEnv->pool->_private,
uriEnv->uri, REG_EXTENDED);
+if (!preg) {
+#else
regex_t *preg = (regex_t *)uriEnv->pool->calloc( env, uriEnv->pool,
sizeof(regex_t));
if (regcomp(preg, uriEnv->uri, REG_EXTENDED)) {
+#endif
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.parseName() error compiling regexp %s\n",
uri);
@@ -132,14 +141,19 @@
if (pcre) {
++uri;
uriEnv->match_type = MATCH_TYPE_REGEXP;
-#ifdef HAS_PCRE
+#if defined(HAS_PCRE) || defined(HAS_AP_PCRE)
uriEnv->uri = uriEnv->pool->pstrdup(env, uriEnv->pool, uri);
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.parseName() parsing regexp %s\n",
uri);
{
+#ifdef HAS_AP_PCRE
+regex_t *preg = ap_pregcomp((apr_pool_t *)uriEnv->pool->_private,
uriEnv->uri, REG_EXTENDED);
+if (!preg) {
+#else
regex_t *preg = (regex_t *)uriEnv->pool->calloc( env, uriEnv->pool,
sizeof(regex_t));
if (regcomp(preg, uriEnv->uri, REG_EXTENDED)) {
+#endif
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"uriEnv.parseName() error compiling regexp %s\n",
uri);
1.68 +8 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- jk_uriMap.c 24 Feb 2004 08:44:40 - 1.67
+++ jk_uriMap.c 27 Feb 2004 19:10:07 - 1.68
@@ -34,9 +34,15 @@
#include "jk_uriMap.h"
#include "jk_registry.h"
+#ifdef HAS_AP_PCRE
+#include "httpd.h"
+#define REGEXEC ap_regexec
+#else
#ifdef HAS_PCRE
#include "pcre.h"
#include "pcreposix.h"
+#define REGEXEC regexec
+#endif
#endif
static INLINE const char *jk2_findExtension(jk_env_t *env, const char *uri);
@@ -304,7 +310,7 @@
return uriMap->vhosts->get(env, uriMap->vhosts, "*");
}
-#ifdef HAS_PCRE
+#if defined(HAS_PCRE) || defined(HAS_AP_PCRE)
static jk_uriEnv_t *jk2_uriMap_regexpMap(jk_env_t *env, jk_uriMap_t *uriMap,
jk_map_t *mapTable, const char *uri)
{
@@ -317,7 +323,7 @@
if (uwr->regexp) {
regex_t *r = (regex_t *)uwr->regexp;
regmatch_t regm[10];
-if (!regexec(r, uri, r->re_nsub + 1, regm, 0)) {
+if (!REGEXEC(r, uri, r->re_nsub + 1, regm, 0)) {
return uwr;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
truk2004/02/24 19:33:06 Modified:jk/native/common jk_ajp_common.c Log: Fix bug 22604. Patch from David Rees. Revision ChangesPath 1.52 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c Index: jk_ajp_common.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- jk_ajp_common.c 24 Feb 2004 08:45:46 - 1.51 +++ jk_ajp_common.c 25 Feb 2004 03:33:06 - 1.52 @@ -718,7 +718,7 @@ jk_log(l, JK_LOG_INFO, "Error connecting to tomcat. Tomcat is probably not started or is " - "listenning on the wrong port. Failed errno = %d\n", + "listening on the wrong port. Failed errno = %d\n", errno); return JK_FALSE; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_ws.m4
truk2004/02/24 05:17:07
Modified:jk/support jk_ws.m4
Log:
Need APACHE2_LIBDIR here
Revision ChangesPath
1.9 +3 -2 jakarta-tomcat-connectors/jk/support/jk_ws.m4
Index: jk_ws.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_ws.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_ws.m4 24 Feb 2004 08:51:53 - 1.8
+++ jk_ws.m4 24 Feb 2004 13:17:07 - 1.9
@@ -61,6 +61,7 @@
$2_CFLAGS="-I ${tempval}/include"
$2_DIR=${tempval}
$2_HOME="${tempval}"
+$2_LIBDIR=""
if ${TEST} -d ${withval}/include ; then
$2_INCL="-I${tempval}/include"
$2_INCDIR="${tempval}/include"
@@ -87,6 +88,7 @@
APR_CFLAGS=`${tempval}/srclib/apr/apr-config --cflags`
APR_UTIL_INCDIR=-I${tempval}/srclib/apr-util/include
APR_LIBDIR_LA=`${tempval}/srclib/apr/apr-config --apr-la-file`
+ $2_LIBDIR=${tempval}/lib
AC_SUBST(APR_INCDIR)
AC_SUBST(APR_CFLAGS)
@@ -94,7 +96,6 @@
AC_SUBST(APR_UTIL_INCDIR)
fi
$2_LDFLAGS=""
-$2_LIBDIR=""
WEBSERVERS="${WEBSERVERS} $4"
AC_SUBST($2_BUILD)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apxs.m4
truk2004/02/23 20:00:30
Modified:jk/native2/server/apache2 Makefile.in
jk/support jk_apxs.m4
Log:
Need to use apxs to get APACHE2_LIBDIR
Revision ChangesPath
1.19 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 10 Feb 2004 04:24:13 - 1.18
+++ Makefile.in 24 Feb 2004 04:00:30 - 1.19
@@ -8,7 +8,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
1.13 +3 -1 jakarta-tomcat-connectors/jk/support/jk_apxs.m4
Index: jk_apxs.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_apxs.m46 Feb 2004 08:53:52 - 1.12
+++ jk_apxs.m424 Feb 2004 04:00:30 - 1.13
@@ -141,6 +141,7 @@
APXS$1_CPPFLAGS="`${APXS$1} -q EXTRA_CPPFLAGS`"
APR_INCDIR="-I`${APXS$1} -q APR_INCLUDEDIR`"
APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`"
+ APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`"
LIBTOOL=`${APXS$1} -q LIBTOOL`
fi
@@ -164,6 +165,7 @@
AC_SUBST(APACHE$1_INCDIR)
AC_SUBST(APACHE$1_INCL)
AC_SUBST(APACHE$1_LIBEXEC)
+ AC_SUBST(APACHE$1_LIBDIR)
AC_SUBST(APACHE$1_CC)
AC_SUBST(APXS$1_LDFLAGS)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 Makefile.in
truk2004/02/19 19:04:43
Modified:jk/native2/server/apache13 Makefile.in
Log:
Add the libraries apr-util needs. Fixes missing expat problem.
Revision ChangesPath
1.13 +2 -1 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 10 Feb 2004 04:24:13 - 1.12
+++ Makefile.in 20 Feb 2004 03:04:42 - 1.13
@@ -9,6 +9,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@/apr-config --ldflags --libs` [EMAIL
PROTECTED]@/apu-config --ldflags --libs`
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
@@ -84,7 +85,7 @@
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
- ${MOD_LINK} -o $@ $^ @APR_LDFLAGS@ [EMAIL PROTECTED]@/apr-config --libs`
+ ${MOD_LINK} -o $@ $^ ${APR_LDFLAGS}
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
truk2004/02/13 13:38:26
Modified:jk/native2 Makefile.in
jk/native2/server/apache13 Makefile.apxs.in
jk/support jk_apr.m4
Log:
add apxs meta targets and jk2-install-apxs from Guenter Knauf
For apache13:
Change apr and apr-util to install into build dirs
Fixup apxs build and add install target
apxs build is the only way to build on OpenBSD right now
due to libtool issues.
Tested on FreeBSD and OpenBSD so far.
Revision ChangesPath
1.5 +16 -1 jakarta-tomcat-connectors/jk/native2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 10 Nov 2003 11:05:33 - 1.4
+++ Makefile.in 13 Feb 2004 21:38:26 - 1.5
@@ -4,6 +4,12 @@
clean: @APR_CLEAN@ jk2-clean
+build-apxs: @APR_BUILD@ jk2-build-apxs
+
+clean-apxs: @APR_CLEAN@ jk2-clean-apxs
+
+install-apxs: jk2-install-apxs
+
jk2-build:
list='@WEBSERVERS@'; \
for i in $$list; do \
@@ -22,6 +28,15 @@
fi; \
done;
+jk2-install-apxs:
+ list='@WEBSERVERS@'; \
+ for i in $$list; do \
+ echo "Making $$target in $$i"; \
+ if test "$$i" != "."; then \
+ (cd $$i && $(MAKE) -f Makefile.apxs install) || exit 1; \
+ fi; \
+ done;
+
jk2-clean:
list='@WEBSERVERS@'; \
for i in $$list; do \
@@ -41,7 +56,7 @@
done;
apr-build:
- ( cd @APR_DIR@ && make && cd @APR_UTIL_DIR@ && make )
+ ( cd @APR_DIR@ && make install && cd @APR_UTIL_DIR@ && make install )
apr-clean:
( cd @APR_DIR@ && make clean && cd @APR_UTIL_DIR@ && make clean )
1.10 +9 -9
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.9
+++ Makefile.apxs.in 13 Feb 2004 21:38:26 - 1.10
@@ -3,28 +3,28 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
JK_DIR := ../..
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
-
-JK=../../common/
-JKINC=../../include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
[EMAIL PROTECTED]@/bin/apr-config --link-ld`
[EMAIL PROTECTED]@/bin/apu-config --link-ld`
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
+JK_CFLAGS=-I ${JK_DIR}/include -DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 ${APR_CFLAGS}
-DHAVE_MMAP
+
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}"
${C_FILES} ${COMMON_C_FILES} ${APR_LIBS}
+ $(APXS) -c -o $@ ${JK_CFLAGS} ${JAVA_INCL} ${C_FILES} ${COMMON_C_FILES} \
+ ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB}
+
+install: mod_jk2.so
+ $(APXS) -i mod_jk2.so
clean:
rm -f *.o *.so
1.12 +5 -5 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_apr.m4 11 Feb 2004 15:08:14 - 1.11
+++ jk_apr.m4 13 Feb 2004 21:38:26 - 1.12
@@ -129,7 +129,7 @@
tempret="0"
JK_EXEC(
[tempret],
- [${SHELL} ./configure --enable-static --disable-shared
${APR_CONFIGURE_ARGS}],
+ [${SHELL} ./configure --prefix=${APR_DIR}
--with-installbuilddir=${APR_DIR}/instbuild --disable-shared ${APR_CONFIGURE_ARGS}],
[apr],
[${APR_DIR}])
if ${TEST} "${tempret}" = "0"; then
@@ -138,7 +138,7 @@
AC_MSG_ERROR(apr configure failed with ${tempret})
fi
JK_APR_LIBNAME(apr_libname,${APR_DIR})
-APR_LDFLAGS="${APR_DIR}/${apr_libname}"
+APR_LDFLAGS="${APR_DIR}/lib/${apr_l
cvs commit: jakarta-tomcat-connectors/jk/support jk_exec.m4
truk2004/02/13 13:24:41
Modified:jk/support jk_exec.m4
Log:
jk_exec_retvalue must be on its own line and \n was always cutting it
Revision ChangesPath
1.4 +2 -1 jakarta-tomcat-connectors/jk/support/jk_exec.m4
Index: jk_exec.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_exec.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_exec.m411 Nov 2003 08:10:20 - 1.3
+++ jk_exec.m413 Feb 2004 21:24:41 - 1.4
@@ -97,7 +97,8 @@
{
$2
- echo "\njk_exec_retvalue $?"
+ echo
+ echo "jk_exec_retvalue $?"
} | {
jk_exec_ret=0
while true ; do
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_java.m4
truk2004/02/11 10:40:58
Modified:jk/support jk_java.m4
Log:
make sure JAVA_HOME is not picked up from env when use_jni is false
Revision ChangesPath
1.6 +5 -1 jakarta-tomcat-connectors/jk/support/jk_java.m4
Index: jk_java.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_java.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_java.m45 Nov 2003 09:14:28 - 1.5
+++ jk_java.m411 Feb 2004 18:40:58 - 1.6
@@ -213,6 +213,10 @@
AC_MSG_RESULT(${JAVA_PLATFORM})
unset tempval
+else
+ # no jni, then make sure JAVA_HOME is not picked up from env
+ JAVA_HOME=""
+ JAVA_PLATFORM=""
fi
])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in
truk2004/02/09 20:39:51
Modified:jk/native2/server/apache13 Makefile.apxs.in
jk/native2/server/apache2 Makefile.apxs.in
Log:
JAVA_HOME is always defined now. Adjust conditionals.
Revision ChangesPath
1.9 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.apxs.in 9 Feb 2004 20:18:48 - 1.8
+++ Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.9
@@ -16,7 +16,7 @@
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
1.8 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.apxs.in 5 Feb 2004 17:40:22 - 1.7
+++ Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.8
@@ -13,7 +13,7 @@
JKINC=${JK_DIR}/include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.in
truk2004/02/09 20:24:13
Modified:jk/native2/server/apache13 Makefile.in
jk/native2/server/apache2 Makefile.in
Log:
JAVA_HOME is always defined now. Adjust conditional.
Revision ChangesPath
1.12 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 6 Feb 2004 14:07:18 - 1.11
+++ Makefile.in 10 Feb 2004 04:24:13 - 1.12
@@ -10,7 +10,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
1.18 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 9 Feb 2004 09:20:28 - 1.17
+++ Makefile.in 10 Feb 2004 04:24:13 - 1.18
@@ -14,7 +14,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 Makefile.apxs.in
truk2004/02/09 12:18:48
Modified:jk/native2/server/apache13 Makefile.apxs.in
Log:
Fix cut and paste error related to bug 15771
Revision ChangesPath
1.8 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.apxs.in 5 Feb 2004 17:40:22 - 1.7
+++ Makefile.apxs.in 9 Feb 2004 20:18:48 - 1.8
@@ -8,7 +8,7 @@
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-C_FILES=jk_service_apache13_c mod_jk2_c
+C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors KEYS
truk2004/01/30 13:54:40 Modified:.KEYS Log: add my key :) Revision ChangesPath 1.13 +16 -0 jakarta-tomcat-connectors/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-connectors/KEYS,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- KEYS 29 Apr 2003 02:30:59 - 1.12 +++ KEYS 30 Jan 2004 21:54:40 - 1.13 @@ -257,3 +257,19 @@ lmtXWDav9mO1Cfc= =Gfxf -END PGP PUBLIC KEY BLOCK- + +Type Bits/KeyID Date User ID +pub 1024R/074C5577 2004-01-22 Kurt Miller <[EMAIL PROTECTED]> + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.2.2 (OpenBSD) + +mQCNA0AP+eEEALgNTbKKzz1eZthGUw8vwBZS/jkodpEKLkGJUyLvCSgb+V7l +cEWqPpOXQOGK7w52sFArx9FtIEq8X2P5WF6UJisEaJoQNS4PCc6KrSSb0BHtMZqO +G+8m9bVeCBPbCQ810oQMOe2LNBZ+uBvIXfzvACN/NrunlrNILsp2j08HTFV3AAUR +tB1LdXJ0IE1pbGxlciA8dHJ1a0BhcGFjaGUub3JnPokAlQMFEEAP+eDKdo9PB0xV +dwEBBCwD+gP3DWtvvVWiSYa8abvlADOQkdK47cBkPk4KuUANHVajkePgtQu0hpkL +LLuO+yjBk34Lke0jYoJWicG3nvRRiZ3GaYEcgsAxysQcqGsocESORVWRB7cxzKiH +sDKQpgzncVh5YbE/YhGs5p2oB/WXCx+9Tpkw5FkD2NtudOfhB5mA +=FtE6 +-END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
