costin 02/05/22 16:52:13
Modified: jk/java/org/apache/jk/common ChannelJni.java
jk/java/org/apache/jk/core JkHandler.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Added the FLUSH code.
That shouldn't change any of the existing behaviors.
Revision Changes Path
1.10 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
Index: ChannelJni.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChannelJni.java 10 May 2002 00:01:44 -0000 1.9
+++ ChannelJni.java 22 May 2002 23:52:13 -0000 1.10
@@ -163,7 +163,7 @@
case JkHandler.HANDLE_SEND_PACKET:
return send( msg, ep );
}
- // Default is FORWARD
+ // Default is FORWARD - called from C
try {
// first, we need to get an endpoint. It should be
// per/thread - and probably stored by the C side.
1.7 +1 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java
Index: JkHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JkHandler.java 17 Apr 2002 22:27:18 -0000 1.6
+++ JkHandler.java 22 May 2002 23:52:13 -0000 1.7
@@ -85,6 +85,7 @@
// will be merged ).
public static final int HANDLE_RECEIVE_PACKET = 10;
public static final int HANDLE_SEND_PACKET = 11;
+ public static final int HANDLE_FLUSH = 12;
public void setWorkerEnv( WorkerEnv we ) {
this.wEnv=we;
1.22 +8 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JkCoyoteHandler.java 16 May 2002 18:57:39 -0000 1.21
+++ JkCoyoteHandler.java 22 May 2002 23:52:13 -0000 1.22
@@ -291,6 +291,11 @@
} else if( actionCode==ActionCode.ACTION_RESET ) {
if( log.isInfoEnabled() )
log.info("RESET " );
+ } else if( actionCode==ActionCode.ACTION_CLIENT_FLUSH ) {
+ org.apache.coyote.Response res=(org.apache.coyote.Response)param;
+ MsgContext ep=(MsgContext)res.getNote( epNote );
+ ep.setType( JkHandler.HANDLE_FLUSH );
+ ep.getSource().invoke( null, ep );
} else if( actionCode==ActionCode.ACTION_CLOSE ) {
if( log.isDebugEnabled() )
log.debug("CLOSE " );
@@ -303,6 +308,9 @@
msg.appendByte( 1 );
ep.setType( JkHandler.HANDLE_SEND_PACKET );
+ ep.getSource().invoke( msg, ep );
+
+ ep.setType( JkHandler.HANDLE_FLUSH );
ep.getSource().invoke( msg, ep );
} else if( actionCode==ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
