nacho 02/04/26 17:48:33
Modified: jk/native2/server/isapi jk_iis.h jk_isapi_plugin.c
jk_service_iis.c
Log:
* Fixing things related to JK_OK change commons
* Filter part is working
* Workers doent initialize ATM.. working on it
Revision Changes Path
1.8 +3 -5 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
Index: jk_iis.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_iis.h 24 Apr 2002 23:00:14 -0000 1.7
+++ jk_iis.h 27 Apr 2002 00:48:33 -0000 1.8
@@ -109,8 +109,7 @@
#define GET_SERVER_VARIABLE_VALUE(pool, name, place) { \
(place) = NULL; \
huge_buf_sz = sizeof(huge_buf); \
- if (get_server_value(env, \
- lpEcb, \
+ if (get_server_value(lpEcb, \
(name), \
huge_buf, \
huge_buf_sz, \
@@ -121,8 +120,7 @@
#define GET_SERVER_VARIABLE_VALUE_INT(name, place, def) { \
huge_buf_sz = sizeof(huge_buf); \
- if (get_server_value(env, \
- lpEcb, \
+ if (get_server_value(lpEcb, \
(name), \
huge_buf, \
huge_buf_sz, \
@@ -152,7 +150,7 @@
int jk2_service_iis_init(jk_env_t *env, jk_ws_service_t *s);
-int get_server_value(struct jk_env *env, LPEXTENSION_CONTROL_BLOCK lpEcb,
+int get_server_value( LPEXTENSION_CONTROL_BLOCK lpEcb,
char *name,
char *buf,
DWORD bufsz,
1.10 +17 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_isapi_plugin.c 24 Apr 2002 23:06:07 -0000 1.9
+++ jk_isapi_plugin.c 27 Apr 2002 00:48:33 -0000 1.10
@@ -60,7 +60,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Larry Isaacs <[EMAIL PROTECTED]> *
* Author: Ignacio J. Ortega <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -313,7 +313,7 @@
/* This is a servlet, should redirect ... */
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
"HttpFilterProc [%s] is a servlet url - should redirect to
%s\n",
- uri, worker);
+ uri, uriEnv->workerName);
/* get URI we should forward */
if (uri_select_option == URI_SELECT_OPT_UNPARSED) {
@@ -378,7 +378,7 @@
* We reject such postings !
*/
env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "HttpFilterProc check if [%s] is points to the web-inf
directory\n",
+ "HttpFilterProc check if [%s] is pointing to the web-inf
directory\n",
uri);
if(jk_requtil_uriIsWebInf(uri)) {
@@ -447,14 +447,25 @@
int rc1;
GET_SERVER_VARIABLE_VALUE(workerEnv->pool,HTTP_WORKER_HEADER_NAME, (
worker_name ));
- worker=workerEnv->worker_map->get(env,workerEnv->worker_map,worker_name);
+ worker=env->getByName( env, worker_name);
+
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "HttpExtensionProc %s a worker for name %s\n",
+ worker ? "got" : "could not get",
+ worker_name);
+
+ if( worker==NULL ){
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "HttpExtensionProc worker is NULL\n");
+ return rc;
+ }
/* Get a pool for the request XXX move it in workerEnv to
be shared with other server adapters */
rPool= worker->rPoolCache->get( env, worker->rPoolCache );
if( rPool == NULL ) {
rPool=worker->pool->create( env, worker->pool, HUGE_POOL_SIZE );
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler(): new rpool\n");
+ "HttpExtensionProc: new rpool\n");
}
jk2_service_iis_init( env, s );
@@ -467,11 +478,6 @@
/* Initialize the ws_service structure */
s->init( env, s, worker, lpEcb );
- /* env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "HttpExtensionProc %s a worker for name %s\n",
- worker ? "got" : "could not get",
- worker_name);
- */
rc = worker->service(env, worker, s);
s->afterRequest(env, s);
@@ -546,7 +552,7 @@
jk_env_t *env=jk2_create_config();
- rc=workerEnv->config->setPropertyString( env, workerEnv->config, "config.file",
worker_file );
+ rc=(JK_OK == workerEnv->config->setPropertyString( env, workerEnv->config,
"config.file", worker_file ));
/* Logging the initialization type: registry or properties file in virtual dir
*/
1.11 +4 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_service_iis.c 25 Apr 2002 19:25:11 -0000 1.10
+++ jk_service_iis.c 27 Apr 2002 00:48:33 -0000 1.11
@@ -256,7 +256,7 @@
return JK_ERR;
}
-int get_server_value(struct jk_env *env, LPEXTENSION_CONTROL_BLOCK lpEcb,
+int get_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
char *name,
char *buf,
DWORD bufsz,
@@ -267,16 +267,14 @@
buf,
(LPDWORD)&bufsz)) {
strcpy(buf, def_val);
- return JK_ERR;
+ return JK_FALSE;
}
if (bufsz > 0) {
buf[bufsz - 1] = '\0';
}
- env->l->jkLog(env,env->l, JK_LOG_ERROR,
- "jk_ws_service_t::write, NULL parameters\n");
- return JK_OK;
+ return JK_TRUE;
}
@@ -400,8 +398,7 @@
huge_buf_sz = sizeof(huge_buf);
- if (get_server_value(env,
- lpEcb,
+ if (get_server_value(lpEcb,
"ALL_HTTP",
huge_buf,
huge_buf_sz,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
