costin 2002/05/31 19:55:55
Modified: jk/java/org/apache/jk/common ChannelUn.java JniHandler.java
MsgAjp.java
Log:
Reduce debugging for the native components.
Fix bug on recognizing the signature.
Note: since the same C code is now used as both client and server ( to
avoid duplicating it when used by tomcat to receive ajp using native ),
it would be much simpler to have a single signature. However for
AJP over TCP things are much cleaner, and hopefully the next protocol
will be a standard one.
Revision Changes Path
1.21 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChannelUn.java 29 May 2002 02:17:40 -0000 1.20
+++ ChannelUn.java 1 Jun 2002 02:55:55 -0000 1.21
@@ -124,7 +124,7 @@
// unixListenSocket=apr.unSocketListen( file, 10 );
setNativeAttribute( "listen", "10" );
- setNativeAttribute( "debug", "10" );
+ // setNativeAttribute( "debug", "10" );
// Initialize the thread pool and execution chain
if( next==null ) {
1.7 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JniHandler.java 28 May 2002 22:50:37 -0000 1.6
+++ JniHandler.java 1 Jun 2002 02:55:55 -0000 1.7
@@ -124,7 +124,7 @@
nativeJkHandlerP=apr.getJkHandler(xEnv, nativeComponentName );
if( nativeJkHandlerP==0 ) {
- log.info("Component not found, creating it " + nativeComponentName );
+ log.debug("Component not found, creating it " + nativeComponentName );
nativeJkHandlerP=apr.createJkHandler(xEnv, nativeComponentName);
}
log.debug("Native proxy " + nativeJkHandlerP );
1.8 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java
Index: MsgAjp.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MsgAjp.java 28 May 2002 22:51:11 -0000 1.7
+++ MsgAjp.java 1 Jun 2002 02:55:55 -0000 1.8
@@ -326,7 +326,7 @@
int mark = getInt();
len = getInt();
- if( mark != 0x1234 ) {
+ if( mark != 0x1234 && mark != 0x4142 ) {
// XXX Logging
log.error("BAD packet signature " + mark);
dump( "In: " );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
