nacho 02/05/10 16:15:35
Modified: jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
Log:
* JK2 isapi redirector is working!!
Found the latest blocking bug, now needs extensive testing :)
Revision Changes Path
1.14 +9 -6
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_isapi_plugin.c 4 May 2002 19:06:31 -0000 1.13
+++ jk_isapi_plugin.c 10 May 2002 23:15:35 -0000 1.14
@@ -60,7 +60,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Larry Isaacs <[EMAIL PROTECTED]> *
* Author: Ignacio J. Ortega <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.13 $ *
+ * Version: $Revision: 1.14 $ *
***************************************************************************/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -181,8 +181,8 @@
DWORD dwNotificationType,
LPVOID pvNotification)
{
- jk_env_t *env;
- jk_uriEnv_t *uriEnv;
+ jk_env_t *env=NULL;
+ jk_uriEnv_t *uriEnv=NULL;
/* Initialise jk */
if (is_inited && !is_mapread) {
@@ -480,6 +480,12 @@
if (JK_OK == worker->service(env, worker, s)){
rc=HSE_STATUS_SUCCESS;
+ lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "HttpExtensionProc service() returned OK\n");
+ } else {
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "HttpExtensionProc service() Failed\n");
}
s->afterRequest(env, s);
@@ -488,9 +494,6 @@
rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );
- lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "HttpExtensionProc service() returned OK\n");
} else {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"HttpExtensionProc error, not initialized\n");
1.15 +1 -0
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_service_iis.c 4 May 2002 19:06:31 -0000 1.14
+++ jk_service_iis.c 10 May 2002 23:15:35 -0000 1.15
@@ -143,6 +143,7 @@
strcat(headers_str, s->headers_out->valueAt(env,s->headers_out,i));
strcat(headers_str, crlf);
}
+ strcat(headers_str, crlf);
} else {
headers_str = crlf;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
