jfclere 02/04/09 14:00:38
Modified: jk/native2/common jk_config.c jk_workerEnv.c
jk/native2/server/apache13 mod_jk2.c
Log:
Add $(serverRoot) handling for apache13 and jk_config.c (it cores when
modifying the value parameter (in the read only part of executable).
Revision Changes Path
1.8 +8 -8 jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_config.c 26 Mar 2002 03:00:09 -0000 1.7
+++ jk_config.c 9 Apr 2002 21:00:38 -0000 1.8
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose config object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***************************************************************************/
#include "jk_global.h"
@@ -713,10 +713,13 @@
struct jk_pool *resultPool,
char *value)
{
- char *rc = value;
- char *env_start = rc;
+ char *rc;
+ char *env_start;
int rec = 0;
+ rc = value;
+ env_start = value;
+
while(env_start = strstr(env_start, "$(")) {
char *env_end = strstr(env_start, ")");
if( rec++ > 20 ) return rc;
@@ -724,9 +727,7 @@
char env_name[LENGTH_OF_LINE + 1] = "";
char *env_value;
- *env_end = '\0';
- strcpy(env_name, env_start + 2);
- *env_end = ')';
+ strncpy(env_name, env_start + 2, (env_end-env_start)-2);
env_value = m->get(env, m, env_name);
if(env_value == NULL ) {
@@ -741,8 +742,7 @@
if(!new_value) {
break;
}
- *env_start = '\0';
- strcpy(new_value, rc);
+ strncpy(new_value, rc, env_start-rc);
strcat(new_value, env_value);
strcat(new_value, env_end + 1);
offset= env_start - rc + strlen( env_value );
1.24 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_workerEnv.c 2 Apr 2002 19:03:54 -0000 1.23
+++ jk_workerEnv.c 9 Apr 2002 21:00:38 -0000 1.24
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.23 $ *
+ * Version: $Revision: 1.24 $ *
***************************************************************************/
#include "jk_env.h"
@@ -238,7 +238,7 @@
if( configFile == NULL ) {
wEnv->config->setPropertyString( env, wEnv->config,
"config.file",
- "conf/jk2.properties" );
+ "$(serverRoot)/conf/jk2.properties" );
}
jk2_workerEnv_initWorkers( env, wEnv );
1.9 +6 -1 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_jk2.c 26 Mar 2002 03:04:54 -0000 1.8
+++ mod_jk2.c 9 Apr 2002 21:00:38 -0000 1.9
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
/*
@@ -176,6 +176,11 @@
/* Local initialization.
*/
workerEnv->_private = s;
+
+ /* serverRoot via ap_server_root_relative()
+ */
+ workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
+ ap_server_root_relative(p,""));
return JK_TRUE;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
