tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GOMEZ Henri <hgo...@slib.fr>
Subject mod_jk patches for TC 3.3
Date Fri, 10 Nov 2000 16:23:37 GMT
Another patch to add to mod_jk in CVS.

It seems that mod_jk present is TC 3.3 CVS is an old 
snapshot of mod_jk. Many bugs fixes in TC 3.2B6 were
missing. I'll take care of that and send patches to
TC 3.3.

----

--- jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c.orig	Sat Aug 26
03:21:39 2000
+++ jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c	Fri Nov 10 18:08:30
2000
@@ -54,7 +54,7 @@
  */
 
 
/***************************************************************************
- * Description: Apache 2 plugin for Jakarta/Tomcat
*
+ * Description: Apache 1.3 plugin for Jakarta/Tomcat
*
  * Author:      Gal Shachor <shachor@il.ibm.com>
*
  * Version:     $ $
*
 
***************************************************************************/
@@ -78,6 +78,14 @@
 /*
  * Jakarta (jk_) include files
  */
+#ifdef NETWARE
+#define _SYS_TYPES_H_
+#define _NETDB_H_INCLUDED
+#define _IN_
+#define _INET_
+#define _SYS_TIMEVAL_H_
+#define _SYS_SOCKET_H_
+#endif
 #include "jk_global.h"
 #include "jk_util.h"
 #include "jk_map.h"
@@ -343,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();
 
@@ -823,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, 
@@ -850,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;
                 }            
-            }
         }
     }
 
@@ -882,7 +888,6 @@
             if(worker) {
                 r->handler = ap_pstrdup(r->pool, JK_HANDLER);
                 ap_table_setn(r->notes, JK_WORKER_ID, worker);
-                return OK;
             }
         }
     }

---
 


Mime
View raw message