cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_logger_apache2.c jk_map_aprtable.c mod_jk2.c
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 ChangesPath
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 - 1.5
+++ mod_jk2.c 23 Mar 2002 17:15:08 - 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 - 1.14
+++ jk_logger_apache2.c 23 Mar 2002 17:15:08 - 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 - 1.7
+++ jk_map_aprtable.c 23 Mar 2002 17:15:08 - 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 - 1.5
+++ mod_jk2.c 23 Mar 2002 17:15:08 - 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 $
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_logger_apache2.c jk_map_aprtable.c jk_pool_apr.c jk_service_apache2.c
costin 02/01/06 01:06:02
Modified:jk/native2 build.xml
jk/native2/common jk_handler_response.c jk_lb_worker.c
jk/native2/common/apr jk_channel_apr_socket.c
jk/native2/server/apache2 jk_logger_apache2.c
jk_map_aprtable.c jk_pool_apr.c
jk_service_apache2.c
Log:
Few fixes and debug statements.
I reverted to use jk maps for now, there's a strange bug with apr maps. The
extra debug statements will be removed after I figure out the problem.
Revision ChangesPath
1.10 +1 -1 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 5 Jan 2002 10:03:43 - 1.9
+++ build.xml 6 Jan 2002 09:06:02 - 1.10
@@ -43,7 +43,7 @@
!-- Targets --
- target name=main depends=init,apache20,jni,apache13,unixsocket
+ target name=main depends=init,apache20,jni,unixsocket
/target
target name=init
1.12 +3 -3
jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Index: jk_handler_response.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_handler_response.c 17 Dec 2001 07:17:08 - 1.11
+++ jk_handler_response.c 6 Jan 2002 09:06:02 - 1.12
@@ -166,9 +166,9 @@
jk_xlate_from_ascii(valueS, strlen(valueS));
-/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
-/* handler.response() Header[%d] [%s] = [%s]\n, */
-/* i, nameS, valueS); */
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ handler.response() Header[%d] [%s] = [%s]\n,
+ i, nameS, valueS);
/* Do we want this ? Preserve the headers, maybe someone will
need them. Alternative is to use a different buffer every time,
1.11 +5 -4 jakarta-tomcat-connectors/jk/native2/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_lb_worker.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_lb_worker.c16 Dec 2001 23:18:11 - 1.10
+++ jk_lb_worker.c6 Jan 2002 09:06:02 - 1.11
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***/
#include jk_pool.h
@@ -110,7 +110,7 @@
It'll also adjust the load balancing factors.
*/
static jk_worker_t *get_most_suitable_worker(jk_env_t *env, jk_worker_t *p,
- jk_ws_service_t *s)
+ jk_ws_service_t *s, int attempt)
{
jk_worker_t *rc = NULL;
double lb_min = 0.0;
@@ -120,7 +120,7 @@
if(session_route) {
for(i = 0 ; i p-num_of_workers ; i++) {
if(0 == strcmp(session_route, p-lb_workers[i]-name)) {
-if(p-lb_workers[i]-in_error_state) {
+if(attempt 0 p-lb_workers[i]-in_error_state) {
break;
} else {
return p-lb_workers[i];
@@ -165,6 +165,7 @@
{
/* The 'real' endpoint */
jk_endpoint_t *end = NULL;
+int attempt=0;
if(e==NULL || s==NULL || is_recoverable_error==NULL) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
@@ -177,7 +178,7 @@
e-realEndpoint=NULL;
while(1) {
-jk_worker_t *rec = get_most_suitable_worker(env, e-worker, s);
+jk_worker_t *rec = get_most_suitable_worker(env, e-worker, s, attempt++);
int rc;
int is_recoverable = JK_FALSE;
1.2 +15 -15
jakarta-tomcat-connectors/jk/native2/common/apr/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/apr/jk_channel_apr_socket.c,v
retrieving
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_logger_apache2.c jk_map_aprtable.c
costin 01/12/15 09:25:45
Modified:jk/native2/server/apache2 jk_logger_apache2.c
jk_map_aprtable.c
Log:
Added the missing check for level in jk_logger_apache2.
Finish jk_map_aprtable.
Revision ChangesPath
1.9 +1 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_logger_apache2.c 2001/12/14 07:14:59 1.8
+++ jk_logger_apache2.c 2001/12/15 17:25:45 1.9
@@ -132,7 +132,7 @@
char buf[HUGE_BUFFER_SIZE];
#endif
-if( level = l-level )
+if( level l-level )
return JK_TRUE;
if( s==NULL ) {
1.2 +30 -0
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_map_aprtable.c 2001/12/14 07:11:42 1.1
+++ jk_map_aprtable.c 2001/12/15 17:25:45 1.2
@@ -95,6 +95,16 @@
return JK_TRUE;
}
+static int jk_map_aprtable_add( struct jk_env *env, struct jk_map *_this,
+const char *name, void *value )
+{
+apr_table_t *aprMap=_this-_private;
+
+apr_table_addn( aprMap, name, (char *)value );
+
+return JK_TRUE;
+}
+
static int jk_map_aprtable_size( struct jk_env *env, struct jk_map *_this )
{
apr_table_t *aprMap=_this-_private;
@@ -125,6 +135,17 @@
return elts[pos].val;
}
+static void jk_map_aprtable_init(jk_env_t *env, jk_map_t *m, int initialSize,
+void *wrappedObj)
+{
+m-_private=wrappedObj;
+}
+
+static void jk_map_aprtable_clear(jk_env_t *env, jk_map_t *m)
+{
+
+}
+
/* Not used yet */
int jk_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
@@ -134,6 +155,15 @@
jk_map_t *_this=(jk_map_t *)pool-calloc( pool, sizeof(jk_map_t));
*result=_this;
+
+_this-get=jk_map_aprtable_get;
+_this-put=jk_map_aprtable_put;
+_this-add=jk_map_aprtable_add;
+_this-size=jk_map_aprtable_size;
+_this-nameAt=jk_map_aprtable_nameAt;
+_this-valueAt=jk_map_aprtable_valueAt;
+_this-init=jk_map_aprtable_init;
+_this-clear=jk_map_aprtable_clear;
return JK_TRUE;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
