You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2002/02/08 12:52:51 UTC
cvs commit: jakarta-tomcat-connectors/webapp/java/org/apache/catalina/connector/warp WarpRequest.java
jfclere 02/02/08 03:52:51
Modified: webapp/java/org/apache/catalina/connector/warp
WarpRequest.java
Log:
Fixes problem with Warp connector and HTTP POST via SSL (Fix in read() instead
getX509Certificates()).
Submitted by: Glen Nakamura, glen@imodulo.com
Revision Changes Path
1.2 +6 -5 jakarta-tomcat-connectors/webapp/java/org/apache/catalina/connector/warp/WarpRequest.java
Index: WarpRequest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/org/apache/catalina/connector/warp/WarpRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WarpRequest.java 23 Jan 2002 17:48:50 -0000 1.1
+++ WarpRequest.java 8 Feb 2002 11:52:51 -0000 1.2
@@ -180,11 +180,6 @@
throws IOException {
if (closed) throw new IOException("Stream closed");
- if (packet.getType()==Constants.TYPE_CBK_DONE) return(-1);
-
- if (packet.getType()!=Constants.TYPE_CBK_DATA)
- throw new IOException("Invalid WARP packet type for body");
-
if (this.packet.pointer<this.packet.size)
return(((int)this.packet.buffer[this.packet.pointer++])&0x0ff);
@@ -195,6 +190,12 @@
packet.reset();
this.request.getConnection().recv(packet);
+
+ if (packet.getType()==Constants.TYPE_CBK_DONE) return(-1);
+
+ if (packet.getType()!=Constants.TYPE_CBK_DATA)
+ throw new IOException("Invalid WARP packet type for body");
+
return(this.read());
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>