You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/03/26 04:03:01 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c jk_uriMap.c
costin 02/03/25 19:03:01
Modified: jk/native2/common jk_uriEnv.c jk_uriMap.c
Log:
Update, remove excessive debugging.
Revision Changes Path
1.6 +3 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_uriEnv.c 24 Mar 2002 19:24:26 -0000 1.5
+++ jk_uriEnv.c 26 Mar 2002 03:03:01 -0000 1.6
@@ -79,7 +79,7 @@
if( slash==NULL ) {
env->l->jkLog( env, env->l, JK_LOG_ERROR,
- "At least a '/' must be included %s\n", name);
+ "uriEnv.parseUri(): At least a '/' must be included %s\n", name);
return JK_FALSE;
}
@@ -102,8 +102,8 @@
uriEnv->uri=uriEnv->pool->pstrdup(env, uriEnv->pool, n);
jk2_uriEnv_init(env, uriEnv);
- env->l->jkLog( env, env->l, JK_LOG_INFO,
- "Setting path %s for %s\n", n, name);
+ /* env->l->jkLog( env, env->l, JK_LOG_INFO, */
+ /* "uriEnv.parseUri() Setting path %s for %s\n", n, name); */
return JK_TRUE;
}
@@ -267,8 +267,6 @@
jk_pool_t *uriPool;
int err;
jk_uriEnv_t *uriEnv;
-
- env->l->jkLog(env, env->l, JK_LOG_INFO, "uriEnv: Create URI %s %s \n", type, name );
uriPool=(jk_pool_t *)pool->create( env, pool,
HUGE_POOL_SIZE);
1.20 +8 -6 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_uriMap.c 23 Mar 2002 17:27:13 -0000 1.19
+++ jk_uriMap.c 26 Mar 2002 03:03:01 -0000 1.20
@@ -67,7 +67,7 @@
* servlet container.
*
* Author: Gal Shachor <sh...@il.ibm.com>
- * Version: $Revision: 1.19 $
+ * Version: $Revision: 1.20 $
*/
#include "jk_pool.h"
@@ -194,19 +194,21 @@
int err;
jk_uriEnv_t *uriEnv;
char *uriName;
+ jk_bean_t *jkb;
uriName=(char *)uriMap->pool->calloc( env, uriMap->pool,
(vhost==NULL ? 0 : strlen( vhost )) +
(path==NULL ? 0 : strlen( path )) +
+ 10);
- strcpy( uriName, "uri:" );
+ strcpy( uriName, "" );
if( vhost != NULL ) strcat( uriName, vhost );
if( path != NULL ) strcat( uriName, path );
-
- uriEnv=env->createInstance( env, uriMap->pool, "uriEnv", uriName );
- if( uriEnv==NULL )
+
+ jkb=env->createBean2( env, uriMap->pool, "uri", uriName );
+ if( jkb==NULL || jkb->object==NULL )
return NULL;
-
+ uriEnv=jkb->object;
+
uriEnv->workerEnv=uriMap->workerEnv;
uriEnv->mbean->setAttribute( env, uriEnv->mbean, "path", path );
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>