- Harmonize a bit more (the java.io HTTP 1.1 is the template: in the comments for...

  "*" means this method should be common to all protocols, and "HTTP" means the method should be
  common to all HTTP protocols).

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

diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 8c71250..0f037d8 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -20,6 +20,7 @@ import java.net.InetAddress;
 import java.net.URLEncoder;\r
 import java.util.Hashtable;\r
 import java.util.Iterator;\r
+import java.util.concurrent.Executor;\r
 \r
 import javax.management.MBeanRegistration;\r
 import javax.management.MBeanServer;\r
@@ -212,6 +213,16 @@ public class Http11AprProtocol implements ProtocolHandler, MBeanRegistration
 \r
     // -------------------- Pool setup --------------------\r
 \r
+    // *\r
+    public Executor getExecutor() {\r
+        return ep.getExecutor();\r
+    }\r
+    \r
+    // *\r
+    public void setExecutor(Executor executor) {\r
+        ep.setExecutor(executor);\r
+    }\r
+    \r
     public int getMaxThreads() {\r
         return ep.getMaxThreads();\r
     }\r

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index ad52794..73e5a99 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -17,9 +17,7 @@
 package org.apache.coyote.http11;\r
 \r
 import java.io.IOException;\r
-import java.io.InputStream;\r
 import java.io.InterruptedIOException;\r
-import java.io.OutputStream;\r
 import java.net.InetAddress;\r
 import java.net.Socket;\r
 import java.security.AccessController;\r
@@ -31,7 +29,6 @@ import java.util.regex.PatternSyntaxException;
 import org.apache.coyote.ActionCode;\r
 import org.apache.coyote.ActionHook;\r
 import org.apache.coyote.Adapter;\r
-import org.apache.coyote.Processor;\r
 import org.apache.coyote.Request;\r
 import org.apache.coyote.RequestInfo;\r
 import org.apache.coyote.Response;\r
@@ -61,7 +58,7 @@ import org.apache.tomcat.util.threads.ThreadWithAttributes;
  *\r
  * @author Remy Maucherat\r
  */\r
-public class Http11Processor implements Processor, ActionHook {\r
+public class Http11Processor implements ActionHook {\r
 \r
 \r
     /**\r
@@ -650,14 +647,6 @@ public class Http11Processor implements Processor, ActionHook {
 \r
 \r
     /**\r
-     * Set the socket associated with this HTTP connection.\r
-     */\r
-    public void setSocket(Socket socket)\r
-        throws IOException {\r
-        this.socket = socket;\r
-    }\r
-\r
-    /**\r
      * Set the flag to control upload time-outs.\r
      */\r
     public void setDisableUploadTimeout(boolean isDisabled) {\r
@@ -737,7 +726,7 @@ public class Http11Processor implements Processor, ActionHook {
      * responses\r
      * @throws IOException error during an I/O operation\r
      */\r
-    public void process(InputStream input, OutputStream output)\r
+    public void process(Socket socket)\r
         throws IOException {\r
         ThreadWithAttributes thrA=\r
                 (ThreadWithAttributes)Thread.currentThread();\r
@@ -754,8 +743,9 @@ public class Http11Processor implements Processor, ActionHook {
         localPort = -1;\r
 \r
         // Setting up the I/O\r
-        inputBuffer.setInputStream(input);\r
-        outputBuffer.setOutputStream(output);\r
+        this.socket = socket;\r
+        inputBuffer.setInputStream(socket.getInputStream());\r
+        outputBuffer.setOutputStream(socket.getOutputStream());\r
 \r
         // Error flag\r
         error = false;\r

diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index a4c8373..d03484a 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -36,7 +36,6 @@ import org.apache.coyote.RequestInfo;
 import org.apache.tomcat.util.modeler.Registry;\r
 import org.apache.tomcat.util.net.JIoEndpoint;\r
 import org.apache.tomcat.util.net.SSLImplementation;\r
-import org.apache.tomcat.util.net.SSLSupport;\r
 import org.apache.tomcat.util.net.ServerSocketFactory;\r
 import org.apache.tomcat.util.net.JIoEndpoint.Handler;\r
 import org.apache.tomcat.util.res.StringManager;\r
@@ -604,8 +603,7 @@ public class Http11Protocol
                     processor.setSSLSupport(null);\r
                 }\r
                 \r
-                processor.setSocket(socket);\r
-                processor.process(socket.getInputStream(), socket.getOutputStream());\r
+                processor.process(socket);\r
                 return false;\r
 \r
             } catch(java.net.SocketException e) {\r