Author: fhanik Date: Thu Oct 25 10:20:57 2007 New Revision: 588284 URL: http://svn.apache.org/viewvc?rev=588284&view=rev Log: Remaining fix for NIO connector
Modified: tomcat/tc6.0.x/trunk/STATUS tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=588284&r1=588283&r2=588284&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Thu Oct 25 10:20:57 2007 @@ -25,13 +25,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Final fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=43653 - Fixes the 100 Continue response, that got reversed through byte buffer manipulation - last patch before tag, promise :) - http://people.apache.org/~fhanik/patches/bz-43653-complimentary.patch - +1: fhanik, funkman, jim - -1: - * Fix possible DoS condition for the experimental NIO/AJP module (reported by William Leung via email) http://issues.apache.org/bugzilla/show_bug.cgi?id=43621 +1: billbarker,fhanik,funkman, pero, jim Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=588284&r1=588283&r2=588284&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu Oct 25 10:20:57 2007 @@ -417,8 +417,8 @@ if (!committed) { //Socket.send(socket, Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length) < 0 - ByteBuffer buf = ByteBuffer.wrap(Constants.ACK_BYTES,0,Constants.ACK_BYTES.length); - writeToSocket(buf,false); + socket.getBufHandler() .getWriteBuffer().put(Constants.ACK_BYTES,0,Constants.ACK_BYTES.length); + writeToSocket(socket.getBufHandler() .getWriteBuffer(),true); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]