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/04/02 21:03:22 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_logger_apache2.c jk_service_apache2.c
costin 02/04/02 11:03:22
Modified: jk/native2/server/apache2 jk_logger_apache2.c
jk_service_apache2.c
Log:
Small fixes
Revision Changes Path
1.17 +4 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_logger_apache2.c 26 Mar 2002 03:04:54 -0000 1.16
+++ jk_logger_apache2.c 2 Apr 2002 19:03:22 -0000 1.17
@@ -141,7 +141,6 @@
/* XXX It'll go away with env and per thread data !! */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
rc = vsprintf(buf, fmt, args);
- free(buf);
#else
rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
#endif
@@ -157,6 +156,10 @@
} else {
ap_log_error( file, line, APLOG_ERR | APLOG_NOERRNO, 0, s, buf);
}
+
+#ifdef NETWARE
+ free(buf);
+#endif
return rc ;
}
1.14 +3 -3 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_service_apache2.c 24 Mar 2002 19:22:19 -0000 1.13
+++ jk_service_apache2.c 2 Apr 2002 19:03:22 -0000 1.14
@@ -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.13 $
+ * Version: $Revision: 1.14 $
*/
#include "apu_compat.h"
@@ -277,8 +277,8 @@
while( ll > 0 ) {
unsigned long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
r = ap_rwrite((const char *)bb, toSend, s->ws_private );
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "service.write() %ld (%ld) out of %ld \n",toSend, r, ll );
+ /* env->l->jkLog(env, env->l, JK_LOG_INFO, */
+ /* "service.write() %ld (%ld) out of %ld \n",toSend, r, ll ); */
ll-=CHUNK_SIZE;
bb+=CHUNK_SIZE;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>