costin 01/12/05 12:49:48
Modified: jk/native2/server/apache2 jk_logger_apache2.c jk_pool_apr.c
mod_jk.c
Log:
Few small fixes in apache logger and pool.
Removed the old 'manual config' code, it'll be replaced with 'real' per_dir struct.
Revision Changes Path
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_logger_apache2.c 2001/12/04 19:11:56 1.2
+++ jk_logger_apache2.c 2001/12/05 20:49:48 1.3
@@ -152,7 +152,7 @@
if( buf[rc-1] == '\n' )
buf[rc-1]='\0';
- if( level >= JK_LOG_ERROR ) {
+ if( level >= JK_LOG_ERROR_LEVEL ) {
ap_log_error( file, line, APLOG_EMERG | APLOG_NOERRNO, 0, s, buf);
} else {
ap_log_error( file, line, APLOG_DEBUG | APLOG_NOERRNO, 0, s, buf);
1.2 +11 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c
Index: jk_pool_apr.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_pool_apr.c 2001/12/05 00:11:27 1.1
+++ jk_pool_apr.c 2001/12/05 20:49:48 1.2
@@ -64,7 +64,16 @@
#include "jk_pool.h"
#include "jk_env.h"
#include "apr_pools.h"
+#include "apr_strings.h"
+int jk_pool_apr_create( jk_pool_t **newPool, jk_pool_t *parent );
+
+int JK_METHOD jk_pool_apr_factory(jk_env_t *env, void **result,
+ char *type, char *name);
+
+void jk_pool_apr_open(jk_pool_t *_this, apr_pool_t *realPool );
+
+
/** Nothing - apache will take care
*/
static void jk_close_pool(jk_pool_t *p)
@@ -112,10 +121,11 @@
}
static void *jk_pool_apr_strdup(jk_pool_t *p,
- const char *s)
+ const char *s)
{
return apr_pstrdup( (apr_pool_t *)p->_private, s);
}
+
/* Not implemented yet */
1.6 +8 -32 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_jk.c 2001/12/04 23:59:01 1.5
+++ mod_jk.c 2001/12/05 20:49:48 1.6
@@ -60,7 +60,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 $ *
***************************************************************************/
/*
@@ -1124,46 +1124,22 @@
return DECLINED;
workerEnv = (jk_workerEnv_t *)ap_get_module_config(r->server->module_config,
- &jk_module);
- worker_name = apr_table_get(r->notes, JK_WORKER_ID);
+ &jk_module);
l = workerEnv->l;
+ worker_name = apr_table_get(r->notes, JK_WORKER_ID);
+
/* Set up r->read_chunked flags for chunked encoding, if present */
if(rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
return rc;
}
if( worker_name == NULL ) {
- /* we may be here because of a manual directive ( that overrides
- translate and
- sets the handler directly ). We still need to know the worker.
- */
- if( workerEnv->num_of_workers == 1 ) {
- /** We have a single worker ( the common case ).
- ( lb is a bit special, it should count as a single worker but
- I'm not sure how ). We also have a manual config directive that
- explicitely give control to us. */
- worker = workerEnv->defaultWorker;
- worker_name=worker->name;
- l->jkLog(l, JK_LOG_DEBUG,
+ /* SetHandler case - per_dir config should have the worker*/
+ worker = workerEnv->defaultWorker;
+ worker_name=worker->name;
+ l->jkLog(l, JK_LOG_DEBUG,
"Default worker for %s %s\n", r->uri, worker->name);
- } else {
- jk_uriMap_t *uriMap=workerEnv->uriMap;
- jk_uriEnv_t *uriEnv;
-
- uriEnv=uriMap->mapUri( uriMap, NULL, r->uri );
-
- if( uriEnv == NULL ) {
- worker = workerEnv->defaultWorker;
- worker_name=worker->name;
- } else {
- worker = uriEnv->worker;
- worker_name= worker->name;
- }
- l->jkLog(l, JK_LOG_DEBUG,
- "Manual configuration for %s %s\n",
- r->uri, workerEnv->defaultWorker->name);
- }
}
if (1) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
