You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/10/05 08:32:23 UTC
cvs commit: jakarta-tomcat/src/native/apache1.3 mod_jk.c Makefile.linux
larryi 00/10/04 23:32:22
Modified: src/native/apache1.3 Tag: tomcat_32 mod_jk.c Makefile.linux
Log:
Apply mod_jk patches supplied by Henri Gomez
Revision Changes Path
No revision
No revision
1.7.2.2 +7 -10 jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- mod_jk.c 2000/09/13 23:06:21 1.7.2.1
+++ mod_jk.c 2000/10/05 06:32:21 1.7.2.2
@@ -351,7 +351,7 @@
s->remote_host = NULL_FOR_EMPTY(s->remote_host);
s->remote_addr = NULL_FOR_EMPTY(r->connection->remote_ip);
- s->server_name = (char *)(r->hostname ? r->server->server_hostname : r->hostname);
+ s->server_name = (char *)(r->hostname ? r->hostname : r->server->server_hostname);
s->server_port = r->server->port;
s->server_software = (char *)ap_get_server_version();
@@ -831,13 +831,10 @@
static void jk_init(server_rec *s, ap_pool *p)
{
- char *env = getenv("WAS_BORN_BY_APACHE");
jk_map_t *init_map = NULL;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
- fprintf(stdout, "jk_post_config %s\n", env ? env : "NULL"); fflush(stdout);
-
if(conf->log_file && conf->log_level >= 0) {
if(!jk_open_file_logger(&(conf->log),
conf->log_file,
@@ -858,14 +855,15 @@
if(map_alloc(&init_map)) {
if(map_read_properties(init_map, conf->worker_file)) {
- if(!env) {
- putenv("WAS_BORN_BY_APACHE=true");
- return;
- } else {
+
+#if MODULE_MAGIC_NUMBER >= 19980527
+ /* Tell apache we're here */
+ ap_add_version_component("mod_jk");
+#endif
+
if(wc_open(init_map, conf->log)) {
return;
}
- }
}
}
@@ -890,7 +888,6 @@
if(worker) {
r->handler = ap_pstrdup(r->pool, JK_HANDLER);
ap_table_setn(r->notes, JK_WORKER_ID, worker);
- return OK;
}
}
}
1.1.2.1 +9 -23 jakarta-tomcat/src/native/apache1.3/Attic/Makefile.linux
Index: Makefile.linux
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/Makefile.linux,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Makefile.linux 2000/05/26 17:05:04 1.1
+++ Makefile.linux 2000/10/05 06:32:21 1.1.2.1
@@ -1,37 +1,23 @@
## You need to edit this file - configure later :-)
-APACHE_HOME=/usr/local/apache
-OS=linux
-APXS=${APACHE_HOME}/bin/apxs
-
-A13_FLAGS=-I${APACHE_HOME}/include
-
## I assume this one is set up already
# 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
+OS=linux
-CFLAGS=-DHAVE_CONFIG_H -g -fpic -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall
+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
+APXS=/usr/sbin/apxs
JK=../jk/
-SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
- jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
- jk_sockbuf.c jk_map.c jk_uri_worker_map.c
-
-
-OBJS=${patsubst %.c,%.o,${SRCS}}
-
-%.o: ../jk/%.c
- ${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@
+SRCS=../jk/jk_ajp12_worker.c ../jk/jk_connect.c ../jk/jk_msg_buff.c ../jk/jk_util.c ../jk/jk_ajp13.c \
+ ../jk/jk_jni_worker.c ../jk/jk_pool.c ../jk/jk_worker.c ../jk/jk_ajp13_worker.c ../jk/jk_lb_worker.c \
+ ../jk/jk_sockbuf.c ../jk/jk_map.c ../jk/jk_uri_worker_map.c
-.c.o:
- ${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} -I../jk $<
all: mod_jk.so
-mod_jk.so: ${OBJS} mod_jk.o
- $(CC) -shared -o mod_jk.so ${OBJS} mod_jk.o
+mod_jk.so:
+ $(APXS) -I ../jk ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS)
clean:
rm *.o *.so