nacho 02/05/01 15:23:36 Modified: jk/native2/common jk_channel_jni.c jk_vm_default.c jk_worker_ajp13.c jk_workerEnv.c jk/native2/server/isapi isapi.dsp jk_isapi_plugin.c jk_service_iis.c Log: * Diverse fixes mostly cosmetic, except * Fixed correct initialization of request for IIS * Fixed win32 build of JNI * Added JNI to win32 isapi build Revision Changes Path 1.11 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c Index: jk_channel_jni.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_channel_jni.c 25 Apr 2002 18:48:13 -0000 1.10 +++ jk_channel_jni.c 1 May 2002 22:23:36 -0000 1.11 @@ -476,7 +476,7 @@ /** Called by java. Will take the rest of the message and dispatch again to the real target. */ -static int jk2_channel_jni_dispatch(jk_env_t *env, void *target, jk_endpoint_t *ep, jk_msg_t *msg) +static int JK_METHOD jk2_channel_jni_dispatch(jk_env_t *env, void *target, jk_endpoint_t *ep, jk_msg_t *msg) { jk_bean_t *jniChB=(jk_bean_t *)target; jk_channel_t *jniCh=(jk_channel_t *)jniChB->object; 1.10 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c Index: jk_vm_default.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_vm_default.c 25 Apr 2002 19:22:19 -0000 1.9 +++ jk_vm_default.c 1 May 2002 22:23:36 -0000 1.10 @@ -101,7 +101,7 @@ #warning JAVA 1.1 IS NO LONGER SUPPORTED #warning ------------------------------------------------------- -int jk2_vm_factory(jk_env_t *env, jk_pool_t *pool, +int JK_METHOD jk2_vm_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result, char *type, char *name) { @@ -429,7 +429,7 @@ if(jvm_version != JNI_VERSION_1_2 ) { env->l->jkLog(env, env->l, JK_LOG_ERROR, - "vm.detect() found: %X expecting 1.2\n", vm_args.version); + "vm.detect() found: %X expecting 1.2\n", jvm_version); return JK_ERR; } @@ -499,7 +499,7 @@ } -int jk2_vm_factory(jk_env_t *env, jk_pool_t *pool, +int JK_METHOD jk2_vm_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result, char *type, char *name) { 1.10 +4 -3 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c Index: jk_worker_ajp13.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_worker_ajp13.c 25 Apr 2002 19:22:19 -0000 1.9 +++ jk_worker_ajp13.c 1 May 2002 22:23:36 -0000 1.10 @@ -283,7 +283,7 @@ err=e->worker->channel->send( env, e->worker->channel, e, e->request ); - if (err==JK_OK ) { + if (err==JK_OK ) { /* We sent the request, have valid endpoint */ break; } @@ -660,10 +660,10 @@ env->l->jkLog(env, env->l, JK_LOG_INFO, "ajp14.destroy()\n"); - + if( ajp14->endpointCache != NULL ) { jk_endpoint_t *e; - + i=ajp14->endpointCache->count; while( ajp14->endpointCache->count > 0 ) { e= ajp14->endpointCache->get( env, ajp14->endpointCache ); @@ -672,6 +672,7 @@ // we finished all endpoints in the cache break; } + jk2_close_endpoint(env, e); } 1.32 +4 -4 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c Index: jk_workerEnv.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- jk_workerEnv.c 1 May 2002 04:18:34 -0000 1.31 +++ jk_workerEnv.c 1 May 2002 22:23:36 -0000 1.32 @@ -59,7 +59,7 @@ * Description: Workers controller * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.31 $ * + * Version: $Revision: 1.32 $ * ***************************************************************************/ #include "jk_env.h" @@ -375,13 +375,13 @@ if( handler==NULL ) { env->l->jkLog(env, env->l, JK_LOG_ERROR, - "workerEnv.dispath() Invalid code: %d\n", code); + "workerEnv.dispatch() Invalid code: %d\n", code); e->reply->dump(env, e->reply, "Message: "); return JK_ERR; } env->l->jkLog(env, env->l, JK_LOG_INFO, - "workerEnv.dispath() Calling %d %s\n", handler->messageId, + "workerEnv.dispatch() Calling %d %s\n", handler->messageId, handler->name); /* Call the message handler */ @@ -435,7 +435,7 @@ return JK_ERR; } - /* e->reply->dump(env, e->reply, "Received "); */ + ep->reply->dump(env, ep->reply, "Received "); code = (int)msg->getByte(env, msg); rc=jk2_workerEnv_dispatch( env, wEnv, req, ep, code, msg ); 1.6 +5 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- isapi.dsp 20 Apr 2002 22:51:52 -0000 1.5 +++ isapi.dsp 1 May 2002 22:23:36 -0000 1.6 @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE20_HOME)\include" /I "$(APR_HOME)\apr\include" /I "$(APR_HOME)\apr-util\include" /I "$(APACHE20_HOME)\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE20_HOME)\include" /I "$(APR_HOME)\apr\include" /I "$(APR_HOME)\apr-util\include" /I "$(APACHE20_HOME)\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d "_DEBUG" @@ -94,6 +94,10 @@ # Begin Source File SOURCE=.\isapi.def +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_channel_jni.c # End Source File # Begin Source File 1.12 +5 -3 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_isapi_plugin.c 28 Apr 2002 00:23:42 -0000 1.11 +++ jk_isapi_plugin.c 1 May 2002 22:23:36 -0000 1.12 @@ -60,7 +60,7 @@ * Author: Gal Shachor <[EMAIL PROTECTED]> * * Author: Larry Isaacs <[EMAIL PROTECTED]> * * Author: Ignacio J. Ortega <[EMAIL PROTECTED]> * - * Version: $Revision: 1.11 $ * + * Version: $Revision: 1.12 $ * ***************************************************************************/ // This define is needed to include wincrypt,h, needed to get client certificates @@ -478,14 +478,16 @@ /* Initialize the ws_service structure */ s->init( env, s, worker, lpEcb ); - rc = worker->service(env, worker, s); + if (JK_OK == worker->service(env, worker, s)){ + rc=HSE_STATUS_SUCCESS; + } s->afterRequest(env, s); rPool->reset(env, rPool); rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool ); - rc=HSE_STATUS_SUCCESS; + lpEcb->dwHttpStatusCode = HTTP_STATUS_OK; env->l->jkLog(env, env->l, JK_LOG_DEBUG, "HttpExtensionProc service() returned OK\n"); 1.13 +1 -1 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_service_iis.c 28 Apr 2002 00:23:42 -0000 1.12 +++ jk_service_iis.c 1 May 2002 22:23:36 -0000 1.13 @@ -519,7 +519,7 @@ if(s==NULL ) { return JK_ERR; } - + jk2_requtil_initRequest(env, s); s->head = jk2_service_iis_head; s->read = jk2_service_iis_read; s->write = jk2_service_iis_write;
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>