costin 02/04/09 13:40:44
Modified: jk/java/org/apache/jk/common JkInputStream.java
jk/java/org/apache/jk/core JkHandler.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Revision Changes Path
1.5 +10 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java
Index: JkInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JkInputStream.java 3 Apr 2002 23:56:08 -0000 1.4
+++ JkInputStream.java 9 Apr 2002 20:40:43 -0000 1.5
@@ -68,6 +68,7 @@
import javax.servlet.http.Cookie;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.ServerCookie;
import org.apache.tomcat.util.http.MimeHeaders;
@@ -270,6 +271,15 @@
contentLength=-1;
}
+ public int doRead(ByteChunk responseChunk ) throws IOException {
+ log.info( "JkInputStream: " + pos + " " + blen + " " + available );
+ if( blen == pos ) {
+ receive();
+ }
+ responseChunk.setBytes( bodyBuff, pos, blen-pos );
+ return blen - pos;
+ }
+
/** Receive a chunk of data. Called to implement the
* 'special' packet in ajp13 and to receive the data
* after we send a GET_BODY packet
1.4 +2 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JkHandler.java 4 Apr 2002 19:00:09 -0000 1.3
+++ JkHandler.java 9 Apr 2002 20:40:43 -0000 1.4
@@ -62,6 +62,8 @@
import java.util.*;
import java.security.*;
+import org.apache.tomcat.util.handler.*;
+
/**
*
* @author Costin Manolache
1.7 +2 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JkCoyoteHandler.java 9 Apr 2002 20:19:53 -0000 1.6
+++ JkCoyoteHandler.java 9 Apr 2002 20:40:44 -0000 1.7
@@ -229,9 +229,9 @@
log.info("COMMIT sending headers " + res + " " +
res.getMimeHeaders() );
- C2B c2b=(C2B)res.getNote( utfC2bNote );
+ C2BConverter c2b=(C2BConverter)res.getNote( utfC2bNote );
if( c2b==null ) {
- c2b=new C2B( "UTF8" );
+ c2b=new C2BConverter( "UTF8" );
res.setNote( utfC2bNote, c2b );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
