Author: markt
Date: Fri Aug 30 23:11:33 2013
New Revision: 1519114
URL: http://svn.apache.org/r1519114
Log:
Add a (current unused) method to set socket timeouts
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1519114&r1=1519113&r2=1519114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Fri Aug
30 23:11:33 2013
@@ -46,6 +46,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketWrapper;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -648,6 +649,10 @@ public abstract class AbstractAjpProcess
protected abstract void output(byte[] src, int offset, int length)
throws IOException;
+ // Methods used by process
+ protected abstract void setTimeout(SocketWrapper<S> socketWrapper,
+ int timeout) throws IOException;
+
// Methods used by SocketInputBuffer
/** Receive a chunk of data. Called to implement the
* 'special' packet in ajp13 and to receive the data
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1519114&r1=1519113&r2=1519114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Fri Aug 30
23:11:33 2013
@@ -272,6 +272,13 @@ public class AjpAprProcessor extends Abs
// ------------------------------------------------------ Protected Methods
+ @Override
+ protected void setTimeout(SocketWrapper<Long> socketWrapper,
+ int timeout) throws IOException {
+ Socket.timeoutSet(
+ socketWrapper.getSocket().longValue(), timeout * 1000);
+ }
+
@Override
protected void output(byte[] src, int offset, int length)
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1519114&r1=1519113&r2=1519114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Fri Aug 30
23:11:33 2013
@@ -266,6 +266,13 @@ public class AjpNioProcessor extends Abs
// ------------------------------------------------------ Protected Methods
@Override
+ protected void setTimeout(SocketWrapper<NioChannel> socketWrapper,
+ int timeout) throws IOException {
+ socketWrapper.setTimeout(timeout);
+ }
+
+
+ @Override
protected void output(byte[] src, int offset, int length)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1519114&r1=1519113&r2=1519114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 30
23:11:33 2013
@@ -282,6 +282,13 @@ public class AjpProcessor extends Abstra
// ------------------------------------------------------ Protected Methods
@Override
+ protected void setTimeout(SocketWrapper<Socket> socketWrapper,
+ int timeout) throws IOException {
+ socketWrapper.getSocket().setSoTimeout(timeout);
+ }
+
+
+ @Override
protected void output(byte[] src, int offset, int length)
throws IOException {
output.write(src, offset, length);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
