Author: markt
Date: Sun Nov 23 22:51:14 2014
New Revision: 1641287
URL: http://svn.apache.org/r1641287
Log:
Pull up common protocol initial settings
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 23
22:51:14 2014
@@ -92,6 +92,8 @@ public abstract class AbstractProtocol<S
public AbstractProtocol(AbstractEndpoint<S> endpoint) {
this.endpoint = endpoint;
+ setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
+ setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
}
Modified: tomcat/trunk/java/org/apache/coyote/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Constants.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Constants.java Sun Nov 23 22:51:14 2014
@@ -44,6 +44,9 @@ public final class Constants {
public static final int STAGE_KEEPALIVE = 6;
public static final int STAGE_ENDED = 7;
+ // Default protocol settings
+ public static final int DEFAULT_CONNECTION_LINGER = -1;
+ public static final boolean DEFAULT_TCP_NO_DELAY = true;
/**
* Has security been turned on?
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 23
22:51:14 2014
@@ -44,6 +44,9 @@ public abstract class AbstractAjpProtoco
public AbstractAjpProtocol(AbstractEndpoint<S> endpoint) {
super(endpoint);
+ setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
+ // AJP does not use Send File
+ getEndpoint().setUseSendfile(false);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 23
22:51:14 2014
@@ -58,11 +58,6 @@ public class AjpAprProtocol extends Abst
super(new AprEndpoint());
cHandler = new AjpConnectionHandler(this);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
- // AJP does not use Send File
- getEndpoint().setUseSendfile(false);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 23
22:51:14 2014
@@ -55,11 +55,6 @@ public class AjpNio2Protocol extends Abs
super(new Nio2Endpoint());
cHandler = new AjpConnectionHandler(this);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
- // AJP does not use Send File
- getEndpoint().setUseSendfile(false);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 23
22:51:14 2014
@@ -57,11 +57,6 @@ public class AjpNioProtocol extends Abst
super(new NioEndpoint());
cHandler = new AjpConnectionHandler(this);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
- // AJP does not use Send File
- getEndpoint().setUseSendfile(false);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/Constants.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/Constants.java Sun Nov 23 22:51:14
2014
@@ -25,9 +25,7 @@ import java.util.Hashtable;
*/
public final class Constants {
- public static final int DEFAULT_CONNECTION_LINGER = -1;
public static final int DEFAULT_CONNECTION_TIMEOUT = -1;
- public static final boolean DEFAULT_TCP_NO_DELAY = true;
// Prefix codes for message types from server to container
public static final byte JK_AJP13_FORWARD_REQUEST = 2;
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 23 22:51:14 2014
@@ -23,6 +23,7 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint<S> endpoint) {
super(endpoint);
+ setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Constants.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Constants.java Sun Nov 23
22:51:14 2014
@@ -36,9 +36,7 @@ public final class Constants {
*/
public static final String Package = "org.apache.coyote.http11";
- public static final int DEFAULT_CONNECTION_LINGER = -1;
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
- public static final boolean DEFAULT_TCP_NO_DELAY = true;
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sun Nov
23 22:51:14 2014
@@ -68,9 +68,6 @@ public class Http11AprProtocol extends A
super(new AprEndpoint());
cHandler = new Http11ConnectionHandler(this);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
}
private final Http11ConnectionHandler cHandler;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Sun Nov
23 22:51:14 2014
@@ -61,9 +61,6 @@ public class Http11Nio2Protocol extends
super(new Nio2Endpoint());
cHandler = new Http11ConnectionHandler(this);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Nov
23 22:51:14 2014
@@ -66,9 +66,6 @@ public class Http11NioProtocol extends A
super(new NioEndpoint());
cHandler = new Http11ConnectionHandler(this);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
}
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java?rev=1641287&r1=1641286&r2=1641287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Sun Nov 23
22:51:14 2014
@@ -68,9 +68,7 @@ public class SpdyProxyProtocol extends A
public SpdyProxyProtocol() {
super(new NioEndpoint());
((NioEndpoint) getEndpoint()).setHandler(cHandler);
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
- setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
