Make sure the socket buffer is not bigger than anticipated header size

Reuse the key attachment objects properly

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@468124 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 11e7057..1da6684 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -83,7 +83,7 @@ public class Http11NioProcessor implements ActionHook {
     // ----------------------------------------------------------- Constructors
 
 
-    public Http11NioProcessor(int rxBufSize, int txBufSize, NioEndpoint endpoint) {
+    public Http11NioProcessor(int rxBufSize, int txBufSize, int maxHttpHeaderSize, NioEndpoint endpoint) {
 
         this.endpoint = endpoint;
 
@@ -95,12 +95,12 @@ public class Http11NioProcessor implements ActionHook {
             readTimeout = timeout;
             //readTimeout = -1;
         }
-        inputBuffer = new InternalNioInputBuffer(request, rxBufSize,readTimeout);
+        inputBuffer = new InternalNioInputBuffer(request, maxHttpHeaderSize,readTimeout);
         request.setInputBuffer(inputBuffer);
 
         response = new Response();
         response.setHook(this);
-        outputBuffer = new InternalNioOutputBuffer(response, txBufSize,readTimeout);
+        outputBuffer = new InternalNioOutputBuffer(response, maxHttpHeaderSize,readTimeout);
         response.setOutputBuffer(outputBuffer);
         request.setResponse(response);
 

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 2689ab6..d05bf8a 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -655,8 +655,9 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
 
         public Http11NioProcessor createProcessor() {
             Http11NioProcessor processor = new Http11NioProcessor(
-              Math.max(proto.maxHttpHeaderSize,proto.ep.getSocketProperties().getRxBufSize()),
-              Math.max(proto.maxHttpHeaderSize,proto.ep.getSocketProperties().getRxBufSize()), 
+              proto.ep.getSocketProperties().getRxBufSize(),
+              proto.ep.getSocketProperties().getTxBufSize(), 
+              proto.maxHttpHeaderSize,
               proto.ep);
             processor.setAdapter(proto.adapter);
             processor.setMaxKeepAliveRequests(proto.maxKeepAliveRequests);

diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
index fd625a1..206880f 100644 (file)
--- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -605,7 +605,7 @@ public class InternalNioOutputBuffer
 
     int total = 0;
     private void addToBB(byte[] buf, int offset, int length) throws IOException {
-        if (socket.getBufHandler().getWriteBuffer().remaining() <= length) {
+        if (socket.getBufHandler().getWriteBuffer().remaining() < length) {
             flushBuffer();
         }
         socket.getBufHandler().getWriteBuffer().put(buf, offset, length);

diff --git a/java/org/apache/coyote/http11/InternalOutputBuffer.java b/java/org/apache/coyote/http11/InternalOutputBuffer.java
index 4acce12..398e935 100644 (file)
--- a/java/org/apache/coyote/http11/InternalOutputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalOutputBuffer.java
@@ -61,6 +61,7 @@ public class InternalOutputBuffer
     public InternalOutputBuffer(Response response, int headerBufferSize) {
 
         this.response = response;
+        
         headers = response.getMimeHeaders();
 
         headerBuffer = new byte[headerBufferSize];

diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java
index d28fc56..ce34154 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -26,6 +26,7 @@ import java.nio.channels.SocketChannel;
 import org.apache.tomcat.util.net.NioEndpoint.Poller;
 import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
 import java.nio.channels.Selector;
+import java.nio.channels.SelectionKey;
 
 /**
  * 
@@ -82,7 +83,7 @@ public class NioChannel implements ByteChannel{
      */
     public void close() throws IOException {
         getIOChannel().socket().close();
-        sc.close();
+        getIOChannel().close();
     }
 
     public void close(boolean force) throws IOException {
@@ -122,7 +123,14 @@ public class NioChannel implements ByteChannel{
         return sc.read(dst);
     }
 
-
+    public Object getAttachment(boolean remove) {
+        Poller pol = getPoller();
+        Selector sel = pol!=null?pol.getSelector():null;
+        SelectionKey key = sel!=null?getIOChannel().keyFor(sel):null;
+        Object att = key!=null?key.attachment():null;
+        if (key != null && att != null && remove ) key.attach(null);
+        return att;
+    }
     /**
      * getBufHandler
      *

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 1e29669..4c7a4a5 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -165,16 +165,7 @@ public class NioEndpoint {
     protected ConcurrentLinkedQueue<NioChannel> nioChannels = new ConcurrentLinkedQueue<NioChannel>() {
         protected AtomicInteger size = new AtomicInteger(0);
         protected AtomicInteger bytes = new AtomicInteger(0);
-        public boolean offer(NioChannel socket) {
-            Poller pol = socket.getPoller();
-            Selector sel = pol!=null?pol.getSelector():null;
-            SelectionKey key = sel!=null?socket.getIOChannel().keyFor(sel):null;
-            KeyAttachment att = key!=null?(KeyAttachment)key.attachment():null;
-            if ( att!=null ) { 
-                att.reset(); 
-                keyCache.offer(att); 
-            }
-            if ( key!=null ) key.attach(null);
+        public boolean offer(NioChannel socket, KeyAttachment att) {
             boolean offer = socketProperties.getBufferPool()==-1?true:size.get()<socketProperties.getBufferPool();
             offer = offer && (socketProperties.getBufferPoolSize()==-1?true:(bytes.get()+socket.getBufferSize())<socketProperties.getBufferPoolSize());
             //avoid over growing our cache or add after we have stopped
@@ -1037,6 +1028,10 @@ public class NioEndpoint {
                 }
             }//end if
         }//run
+        
+        public String toString() {
+            return super.toString()+"[intOps="+this.interestOps+"]";
+        }
     }
     /**
      * Poller class.
@@ -1159,7 +1154,6 @@ public class NioEndpoint {
          * hands them off to an appropriate processor.
          */
         public void run() {
-
             // Loop until we receive a shutdown command
             while (running) {
                 // Loop if endpoint is paused
@@ -1178,8 +1172,8 @@ public class NioEndpoint {
 
                 int keyCount = 0;
                 try {
-                    wakeupCounter.set(0);
                     keyCount = selector.select(selectorTimeout);
+                    wakeupCounter.set(0);
                     if ( close ) { selector.close(); return; }
                 } catch ( NullPointerException x ) {
                     //sun bug 5076772 on windows JDK 1.5
@@ -1456,18 +1450,22 @@ public class NioEndpoint {
                             if ((status != null) && (handler.event(socket, status) == Handler.SocketState.CLOSED)) {
                                 // Close socket and pool
                                 try {
+                                    KeyAttachment att = (KeyAttachment)socket.getAttachment(true);
                                     try {socket.close();}catch (Exception ignore){}
                                     if ( socket.isOpen() ) socket.close(true);
                                     nioChannels.offer(socket);
+                                    if ( att!=null ) keyCache.offer(att);
                                 }catch ( Exception x ) {
                                     log.error("",x);
                                 }
                             } else if ((status == null) && (handler.process(socket) == Handler.SocketState.CLOSED)) {
                                 // Close socket and pool
                                 try {
+                                    KeyAttachment att = (KeyAttachment)socket.getAttachment(true);
                                     try {socket.close();}catch (Exception ignore){}
                                     if ( socket.isOpen() ) socket.close(true);
                                     nioChannels.offer(socket);
+                                    if ( att!=null ) keyCache.offer(att);
                                 }catch ( Exception x ) {
                                     log.error("",x);
                                 }