costin 02/03/23 09:15:08
Modified: jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 jk_logger_apache2.c
jk_map_aprtable.c mod_jk2.c
Log:
Few fixes, add a setAttribute to jk_logger_apache2.
Now both Apache1.3 and Apache2 are working ( with the new config ), and
are able to serve at least the status page.
I'll start re-checking ajp13.
Revision Changes Path
1.6 +3 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_jk2.c 19 Mar 2002 04:55:57 -0000 1.5
+++ mod_jk2.c 23 Mar 2002 17:15:08 -0000 1.6
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
/*
@@ -326,8 +326,8 @@
if( worker==NULL && uriEnv->workerName != NULL ) {
worker=env->getByName( env,uriEnv->workerName);
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() finding worker for %p %p\n",
- worker, uriEnv );
+ "mod_jk.handler() finding worker for %s %p %p\n",
+ uriEnv->workerName, worker, uriEnv );
uriEnv->worker=worker;
}
}
1.15 +18 -0
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_logger_apache2.c 18 Mar 2002 18:46:27 -0000 1.14
+++ jk_logger_apache2.c 23 Mar 2002 17:15:08 -0000 1.15
@@ -162,6 +162,23 @@
return rc ;
}
+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, "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 );
+ }
+ }
+}
+
+
int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
char *type, char *name)
@@ -182,6 +199,7 @@
result->object=(void *)l;
l->mbean=result;
+ result->setAttribute = jk2_logger_file_setProperty;
return JK_TRUE;
}
1.8 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c
Index: jk_map_aprtable.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_map_aprtable.c 18 Mar 2002 18:46:27 -0000 1.7
+++ jk_map_aprtable.c 23 Mar 2002 17:15:08 -0000 1.8
@@ -87,7 +87,7 @@
{
apr_table_t *aprMap=_this->_private;
if( oldValue != NULL ) {
- *oldValue=apr_table_get( aprMap, (char *)name );
+ *oldValue=(void *)apr_table_get( aprMap, (char *)name );
}
apr_table_setn( aprMap, name, (char *)value );
1.6 +4 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_jk2.c 19 Mar 2002 04:55:57 -0000 1.5
+++ mod_jk2.c 23 Mar 2002 17:15:08 -0000 1.6
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
/*
@@ -280,6 +280,9 @@
#endif
env->l=l;
+
+ /* We should make it relative to JK_HOME or absolute path.
+ ap_server_root_relative(cmd->pool,opt); */
/* Create the workerEnv */
workerEnv= env->createInstance( env, env->globalPool,"workerEnv", "workerEnv");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
