From 7875f0e3f7157b5fe64536a79ccc11352ebe8775 Mon Sep 17 00:00:00 2001 From: fhanik Date: Thu, 25 Oct 2007 17:20:57 +0000 Subject: [PATCH] Remaining fix for NIO connector git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@588284 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 ------- java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/STATUS b/STATUS index fc60e3a35..fa929b6f4 100644 --- a/STATUS +++ b/STATUS @@ -25,13 +25,6 @@ $Revision$ $Date$ 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 diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index 35f5772f4..e0661f5b0 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -417,8 +417,8 @@ public class InternalNioOutputBuffer 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); } } -- 2.11.0