Author: remm
Date: Fri Apr 28 06:19:23 2006
New Revision: 397894
URL: http://svn.apache.org/viewcvs?rev=397894&view=rev
Log:
- Harmonize a bit more (the java.io HTTP 1.1 is the template: in the comments
for the methods,
"*" means this method should be common to all protocols, and "HTTP" means the
method should be
common to all HTTP protocols).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=397894&r1=397893&r2=397894&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Fri Apr 28 06:19:23 2006
@@ -20,6 +20,7 @@
import java.net.URLEncoder;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.concurrent.Executor;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
@@ -212,6 +213,16 @@
// -------------------- Pool setup --------------------
+ // *
+ public Executor getExecutor() {
+ return ep.getExecutor();
+ }
+
+ // *
+ public void setExecutor(Executor executor) {
+ ep.setExecutor(executor);
+ }
+
public int getMaxThreads() {
return ep.getMaxThreads();
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=397894&r1=397893&r2=397894&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri
Apr 28 06:19:23 2006
@@ -17,9 +17,7 @@
package org.apache.coyote.http11;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InterruptedIOException;
-import java.io.OutputStream;
import java.net.InetAddress;
import java.net.Socket;
import java.security.AccessController;
@@ -31,7 +29,6 @@
import org.apache.coyote.ActionCode;
import org.apache.coyote.ActionHook;
import org.apache.coyote.Adapter;
-import org.apache.coyote.Processor;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
@@ -61,7 +58,7 @@
*
* @author Remy Maucherat
*/
-public class Http11Processor implements Processor, ActionHook {
+public class Http11Processor implements ActionHook {
/**
@@ -650,14 +647,6 @@
/**
- * Set the socket associated with this HTTP connection.
- */
- public void setSocket(Socket socket)
- throws IOException {
- this.socket = socket;
- }
-
- /**
* Set the flag to control upload time-outs.
*/
public void setDisableUploadTimeout(boolean isDisabled) {
@@ -737,7 +726,7 @@
* responses
* @throws IOException error during an I/O operation
*/
- public void process(InputStream input, OutputStream output)
+ public void process(Socket socket)
throws IOException {
ThreadWithAttributes thrA=
(ThreadWithAttributes)Thread.currentThread();
@@ -754,8 +743,9 @@
localPort = -1;
// Setting up the I/O
- inputBuffer.setInputStream(input);
- outputBuffer.setOutputStream(output);
+ this.socket = socket;
+ inputBuffer.setInputStream(socket.getInputStream());
+ outputBuffer.setOutputStream(socket.getOutputStream());
// Error flag
error = false;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=397894&r1=397893&r2=397894&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri
Apr 28 06:19:23 2006
@@ -36,7 +36,6 @@
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.JIoEndpoint;
import org.apache.tomcat.util.net.SSLImplementation;
-import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.ServerSocketFactory;
import org.apache.tomcat.util.net.JIoEndpoint.Handler;
import org.apache.tomcat.util.res.StringManager;
@@ -604,8 +603,7 @@
processor.setSSLSupport(null);
}
- processor.setSocket(socket);
- processor.process(socket.getInputStream(),
socket.getOutputStream());
+ processor.process(socket);
return false;
} catch(java.net.SocketException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
