hgomez 02/02/21 10:13:18
Modified: jk/native2/server/apache2 mod_jk.c
Log:
Jk2Worker works now as needed, note it just use Jk2_set2
Revision Changes Path
1.21 +15 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_jk.c 21 Feb 2002 11:21:45 -0000 1.20
+++ mod_jk.c 21 Feb 2002 18:13:17 -0000 1.21
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***************************************************************************/
/*
@@ -284,6 +284,8 @@
env=workerEnv->globalEnv;
+fprintf( stderr, "jk2_set2 : name=%s value=%s\n", name, value);
+
value = jk2_map_replaceProperties(env, m, m->pool, value);
if(value==NULL)
@@ -324,6 +326,15 @@
static const char *jk2_setWorker(cmd_parms *cmd,void *per_dir,
const char *wname, const char *wparam, const char
*value)
{
+#ifndef OLD_WAY
+
+ char * name;
+ name = ap_pstrcat(cmd->pool, "worker.", wname, ".", wparam, NULL);
+/* fprintf( stderr, "jk2_setWorker : name=%s value=%s\n", name, value); */
+ return (jk2_set2(cmd, per_dir, name, value));
+
+#else
+
server_rec *s = cmd->server;
struct stat statbuf;
char *oldv;
@@ -339,9 +350,8 @@
jk_map_t *m=workerEnv->init_data;
env=workerEnv->globalEnv;
-
- nvalue = ap_pstrcat(cmd->pool, "worker.", wname, wparam);
-/* fprintf( stderr, "wname=%s wparam=%s value=%s\n", wname, wparam, value); */
+ nvalue = ap_pstrcat(cmd->pool, "worker.", wname, ".", wparam, NULL); */
+/* fprintf( stderr, "wname=%s wparam=%s value=%s zvalue=%s nvalue=%s\n", wname,
wparam, value, zvalue, nvalue); */
value = jk2_map_replaceProperties(env, m, m->pool, nvalue);
if(value==NULL)
@@ -351,6 +361,8 @@
/* ap_pstrdup(cmd->pool,name), */
/* ap_pstrdup(cmd->pool,value)); */
return NULL;
+
+#endif
}
/* Command table.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
