costin 02/05/15 12:46:46
Modified: jk/native2/jni jk_jni_aprImpl.c
jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
Log:
Save the request start time.
Few small fixes.
Remove unused fields.
Revision Changes Path
1.21 +0 -7 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_jni_aprImpl.c 14 May 2002 17:28:15 -0000 1.20
+++ jk_jni_aprImpl.c 15 May 2002 19:46:46 -0000 1.21
@@ -743,13 +743,6 @@
"jkInvoke() NullPointerException 2\n");
return -1;
}
-
- /* Simulate a receive on the incoming packet. e->reply is what's
- used when receiving data from java.
- */
- ep->currentData = nbuf;
- ep->currentOffset=0;
- /* This was an workaround, no longer used ! */
ep->reply->reset(env, ep->reply);
1.20 +2 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_service_apache2.c 9 May 2002 21:13:12 -0000 1.19
+++ jk_service_apache2.c 15 May 2002 19:46:46 -0000 1.20
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.19 $
+ * Version: $Revision: 1.20 $
*/
#include "apu_compat.h"
@@ -388,6 +388,7 @@
s->no_more_chunks = 0;
s->query_string = r->args;
+ s->startTime = r->request_time;
/*
* The 2.2 servlet spec errata says the uri from
* HttpServletRequest.getRequestURI() should remain encoded.
1.22 +4 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_jk2.c 14 May 2002 20:44:21 -0000 1.21
+++ mod_jk2.c 15 May 2002 19:46:46 -0000 1.22
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.21 $ *
+ * Version: $Revision: 1.22 $ *
***************************************************************************/
/*
@@ -106,8 +106,6 @@
*/
static jk_workerEnv_t *workerEnv;
-#define NO_APACHE_POOL 1
-
/* ==================== Options setters ==================== */
/*
@@ -441,6 +439,8 @@
/* This is the first step */
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.post_config() first invocation\n");
+
+
apr_pool_userdata_set( "INITOK", "mod_jk_init", NULL, gPool );
return OK;
}
@@ -448,6 +448,7 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.post_config() second invocation\n" );
+ workerEnv->parentInit( env, workerEnv);
/* if(!workerEnv->was_initialized) { */
/* workerEnv->was_initialized = JK_OK; */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
