You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/05/03 20:44:03 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
costin 02/05/03 11:44:03
Modified: jk/native2/common jk_channel_apr_socket.c jk_requtil.c
jk/native2/include jk_service.h
jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Even less debugging.
Replace 'send' with 'write' - JFC, do you remember why we used send ??
Revision Changes Path
1.13 +8 -7 jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_channel_apr_socket.c 3 May 2002 18:10:58 -0000 1.12
+++ jk_channel_apr_socket.c 3 May 2002 18:44:03 -0000 1.13
@@ -442,17 +442,18 @@
}
#ifdef HAVE_UNIXSOCKETS
while(sent < len) {
- this_time = send(unixsock, (char *)b + sent , len - sent, 0);
+/* this_time = send(unixsock, (char *)b + sent , len - sent, 0); */
+ this_time = write(unixsock, (char *)b + sent , len - sent);
env->l->jkLog(env, env->l, JK_LOG_INFO,
"channel.apr:send() send() %d %d %s\n", this_time, errno,
strerror( errno));
- if( errno != 0 ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "channel.apr:send() send() %d %d %s\n", this_time, errno,
- strerror( errno));
- return -2;
- }
+/* if( errno != 0 ) { */
+/* env->l->jkLog(env, env->l, JK_LOG_ERROR, */
+/* "channel.apr:send() send() %d %d %s\n", this_time, errno, */
+/* strerror( errno)); */
+/* return -2; */
+/* } */
if(0 == this_time) {
return -2;
}
1.13 +13 -7 jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Index: jk_requtil.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_requtil.c 25 Apr 2002 19:22:19 -0000 1.12
+++ jk_requtil.c 3 May 2002 18:44:03 -0000 1.13
@@ -529,7 +529,12 @@
int i;
int headerCount;
int rc;
+ int debug=0;
+ if( s->uriEnv != NULL ) {
+ debug=s->uriEnv->debug;
+ }
+
rc=jk2_requtil_getMethodId(env, s->method, &method);
if (rc!=JK_OK) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -570,8 +575,9 @@
return JK_ERR;
}
} else {
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "serialize.request() Add headerName %s\n", name);
+ if( debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "serialize.request() Add headerName %s\n", name);
if (msg->appendString(env, msg, name)) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"serialize.request() Error serializing header name\n");
@@ -579,9 +585,6 @@
}
}
- /* env->l->jkLog(env, env->l, JK_LOG_INFO, */
- /* "serialize.request() Add headerValue %s\n", */
- /* s->headers_in->valueAt( env, s->headers_in, i)); */
if (msg->appendString(env, msg,
s->headers_in->valueAt( env, s->headers_in, i))) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -695,9 +698,11 @@
"handle.request() Error serializing end marker\n");
return JK_ERR;
}
+
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "serialize.request() serialized %s\n", s->req_uri);
+ if( debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "serialize.request() serialized %s\n", s->req_uri);
/* msg->dump( env, msg, "Dump: " ); */
return JK_OK;
@@ -1017,6 +1022,7 @@
s->ssl_cipher = NULL;
s->ssl_session = NULL;
s->jvm_route = NULL;
+ s->uriEnv = NULL;
s->outBuf=NULL;
s->jkprintf=jk2_requtil_printf;
1.13 +5 -1 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_service.h 24 Apr 2002 23:12:50 -0000 1.12
+++ jk_service.h 3 May 2002 18:44:03 -0000 1.13
@@ -63,7 +63,7 @@
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Dan Milstein <da...@shore.net> *
* Author: Henri Gomez <hg...@slib.fr> *
- * Version: $Revision: 1.12 $ *
+ * Version: $Revision: 1.13 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -181,6 +181,10 @@
*/
struct jk_pool *pool;
+ /* Result of the mapping
+ */
+
+ struct jk_uriEnv *uriEnv;
/*
* CGI Environment needed by servlets
*/
1.12 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_jk2.c 30 Apr 2002 06:53:34 -0000 1.11
+++ mod_jk2.c 3 May 2002 18:44:03 -0000 1.12
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Henri Gomez <hg...@slib.fr> *
- * Version: $Revision: 1.11 $ *
+ * Version: $Revision: 1.12 $ *
***************************************************************************/
/*
@@ -369,7 +369,7 @@
jk2_service_apache13_init(env, s);
s->pool = rPool;
-
+ s->uriEnv = uriEnv;
s->is_recoverable_error = JK_FALSE;
s->init( env, s, worker, r );
1.16 +2 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_jk2.c 3 May 2002 17:49:53 -0000 1.15
+++ mod_jk2.c 3 May 2002 18:44:03 -0000 1.16
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Henri Gomez <hg...@slib.fr> *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***************************************************************************/
/*
@@ -562,7 +562,7 @@
jk2_service_apache2_init( env, s );
s->pool = rPool;
-
+ s->uriEnv = uriEnv;
s->is_recoverable_error = JK_FALSE;
s->init( env, s, worker, r );
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>