costin 02/03/20 15:44:37
Modified: jk/native2/common jk_env.c jk_logger_file.c jk_uriEnv.c
jk_workerEnv.c
Log:
Various small fixes.
Revision Changes Path
1.12 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_env.c 18 Mar 2002 18:28:37 -0000 1.11
+++ jk_env.c 20 Mar 2002 23:44:37 -0000 1.12
@@ -116,7 +116,7 @@
if( name==NULL ) {
name=pool->calloc( env, pool, 10 );
- snprintf( name, 10, "%s.%d", type, env->id++ );
+ snprintf( (char *)name, 10, "%s.%d", type, env->id++ );
}
fac=jk2_env_getFactory( env, type);
1.14 +26 -25 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_logger_file.c 19 Mar 2002 04:53:40 -0000 1.13
+++ jk_logger_file.c 20 Mar 2002 23:44:37 -0000 1.14
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.13 $ *
+ * Version: $Revision: 1.14 $ *
***************************************************************************/
#include "jk_env.h"
@@ -142,30 +142,6 @@
return JK_LOG_DEBUG_LEVEL;
}
-static int JK_METHOD
-jk2_logger_file_setProperty(jk_env_t *env, jk_bean_t *mbean,
- char *name, void *valueP )
-{
- jk_logger_t *_this=mbean->object;
- char *value=valueP;
- if( strcmp( name, "name" )==0 ) {
- _this->name=(char *)value;
- } else if( strcmp( name, "file" )==0 ) {
- _this->name=(char *)value;
- /* Set the file imediately */
- jk2_logger_file_init(env, (jk_logger_t *)mbean->object );
-
- } else if( strcmp( name, "timeFormat" )==0 ) {
- jk2_logger_file_logFmt = value;
- } else if( strcmp( name, "level" )==0 ) {
- _this->level = jk2_logger_file_parseLogLevel(env, value);
- if( _this->level == 0 ) {
- _this->jkLog( env, _this, JK_LOG_ERROR,
- "Level %s %d \n", value, _this->level );
- }
- }
-}
-
static int jk2_logger_file_init(jk_env_t *env,jk_logger_t *_this )
{
@@ -202,6 +178,31 @@
/* free(_this); */
return JK_TRUE;
}
+
+static int JK_METHOD
+jk2_logger_file_setProperty(jk_env_t *env, jk_bean_t *mbean,
+ char *name, void *valueP )
+{
+ jk_logger_t *_this=mbean->object;
+ char *value=valueP;
+ if( strcmp( name, "name" )==0 ) {
+ _this->name=(char *)value;
+ } else if( strcmp( name, "file" )==0 ) {
+ _this->name=(char *)value;
+ /* Set the file imediately */
+ jk2_logger_file_init(env, (jk_logger_t *)mbean->object );
+
+ } else if( strcmp( name, "timeFormat" )==0 ) {
+ jk2_logger_file_logFmt = value;
+ } else if( strcmp( name, "level" )==0 ) {
+ _this->level = jk2_logger_file_parseLogLevel(env, value);
+ if( _this->level == 0 ) {
+ _this->jkLog( env, _this, JK_LOG_ERROR,
+ "Level %s %d \n", value, _this->level );
+ }
+ }
+}
+
static int jk2_logger_file_jkLog(jk_env_t *env, jk_logger_t *l,
const char *file,
1.3 +3 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_uriEnv.c 18 Mar 2002 18:43:53 -0000 1.2
+++ jk_uriEnv.c 20 Mar 2002 23:44:37 -0000 1.3
@@ -69,6 +69,8 @@
#include "jk_uriMap.h"
#include "jk_registry.h"
+static int jk2_uriEnv_init(jk_env_t *env, jk_uriEnv_t *uriEnv);
+
static int jk2_uriEnv_parseUri( jk_env_t *env, jk_uriEnv_t *uriEnv,
char *name)
{
@@ -274,7 +276,7 @@
/* The name is a path */
if( strchr( name, '/' ) != NULL ) {
- jk2_uriEnv_setProperty( env, result, "uri", name );
+ jk2_uriEnv_setProperty( env, result, "uri", (char *)name );
}
uriEnv->workerEnv=env->getByName( env, "workerEnv" );
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_workerEnv.c 18 Mar 2002 18:33:55 -0000 1.19
+++ jk_workerEnv.c 20 Mar 2002 23:44:37 -0000 1.20
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.19 $ *
+ * Version: $Revision: 1.20 $ *
***************************************************************************/
#include "jk_env.h"
@@ -115,7 +115,7 @@
wEnv->options &= ~JK_OPT_FWDURIMASK;
wEnv->options |= JK_OPT_FWDURIESCAPED;
} else {
- return JK_FALSE;
+ return JK_FALSE;
}
return JK_TRUE;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
