nacho 2002/06/08 17:50:49
Modified: jk/native2/include jk_requtil.h
jk/native2/common jk_shm.c jk_worker_ajp13.c jk_workerEnv.c
Log:
* No warnings
Revision Changes Path
1.7 +10 -0 jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h
Index: jk_requtil.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_requtil.h 19 Apr 2002 02:36:23 -0000 1.6
+++ jk_requtil.h 9 Jun 2002 00:50:48 -0000 1.7
@@ -189,6 +189,16 @@
int jk_requtil_base64EncodeCert(char *encoded,
const unsigned char *string, int len);
+int jk2_serialize_postHead(jk_env_t *env, jk_msg_t *msg,
+ jk_ws_service_t *r,
+ jk_endpoint_t *ae);
+
+int jk2_serialize_request13(jk_env_t *env, jk_msg_t *msg,
+ jk_ws_service_t *s,
+ jk_endpoint_t *ae);
+
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
1.24 +0 -1 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_shm.c 31 May 2002 19:19:45 -0000 1.23
+++ jk_shm.c 9 Jun 2002 00:50:49 -0000 1.24
@@ -536,7 +536,6 @@
jk_msg_t *msg, int raw)
{
jk_shm_t *shm=(jk_shm_t *)bean->object;
- int rc;
if( shm->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
1.29 +1 -2 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_worker_ajp13.c 31 May 2002 22:51:28 -0000 1.28
+++ jk_worker_ajp13.c 9 Jun 2002 00:50:49 -0000 1.29
@@ -72,6 +72,7 @@
#include "jk_service.h"
#include "jk_env.h"
#include "jk_objCache.h"
+#include "jk_reqUtil.h"
#include "jk_registry.h"
#define AJP_DEF_RETRY_ATTEMPTS (2)
@@ -560,7 +561,6 @@
{
jk_endpoint_t *e = NULL;
jk_bean_t *jkb;
- int csOk;
if( ajp13->secret ==NULL ) {
}
@@ -789,7 +789,6 @@
{
jk_worker_t *w=(jk_worker_t *)pool->calloc(env, pool, sizeof(jk_worker_t));
jk_bean_t *jkb;
- int i;
if (name == NULL || w == NULL) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
1.52 +1 -3 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- jk_workerEnv.c 31 May 2002 19:19:45 -0000 1.51
+++ jk_workerEnv.c 9 Jun 2002 00:50:49 -0000 1.52
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.51 $ *
+ * Version: $Revision: 1.52 $ *
***************************************************************************/
#include "jk_env.h"
@@ -591,7 +591,6 @@
{
int err=JK_OK;
jk_worker_t *oldW = NULL;
- int csOk;
w->workerEnv=wEnv;
@@ -653,7 +652,6 @@
{
jk_workerEnv_t *wEnv;
jk_bean_t *jkb;
- int csOk;
wEnv=(jk_workerEnv_t *)pool->calloc( env, pool, sizeof( jk_workerEnv_t ));
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
