Author: markt
Date: Mon Sep 8 18:47:13 2014
New Revision: 1623458
URL: http://svn.apache.org/r1623458
Log:
Pull up common code to reduce duplication identified by Simian.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.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/http11/Http11Protocol.java
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=1623458&r1=1623457&r2=1623458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Mon
Sep 8 18:47:13 2014
@@ -218,4 +218,23 @@ public abstract class AbstractHttp11Prot
}
}
+
+ // ------------------------------------------------------------- Common
code
+
+ // Common configuration required for all new HTTP11 processors
+ protected void configureProcessor(AbstractHttp11Processor<S> processor) {
+ processor.setAdapter(getAdapter());
+ processor.setMaxKeepAliveRequests(getMaxKeepAliveRequests());
+ processor.setKeepAliveTimeout(getKeepAliveTimeout());
+ processor.setConnectionUploadTimeout(getConnectionUploadTimeout());
+ processor.setDisableUploadTimeout(getDisableUploadTimeout());
+ processor.setCompressionMinSize(getCompressionMinSize());
+ processor.setCompression(getCompression());
+ processor.setNoCompressionUserAgents(getNoCompressionUserAgents());
+ processor.setCompressableMimeTypes(getCompressableMimeTypes());
+ processor.setRestrictedUserAgents(getRestrictedUserAgents());
+ processor.setSocketBuffer(getSocketBuffer());
+ processor.setMaxSavePostSize(getMaxSavePostSize());
+ processor.setServer(getServer());
+ }
}
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=1623458&r1=1623457&r2=1623458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Sep
8 18:47:13 2014
@@ -321,20 +321,8 @@ public class Http11AprProtocol extends A
proto.getMaxHttpHeaderSize(), (AprEndpoint)proto.endpoint,
proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
proto.getMaxSwallowSize());
- processor.setAdapter(proto.getAdapter());
- processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setConnectionUploadTimeout(
- proto.getConnectionUploadTimeout());
- processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
- processor.setCompressionMinSize(proto.getCompressionMinSize());
- processor.setCompression(proto.getCompression());
-
processor.setNoCompressionUserAgents(proto.getNoCompressionUserAgents());
-
processor.setCompressableMimeTypes(proto.getCompressableMimeTypes());
- processor.setRestrictedUserAgents(proto.getRestrictedUserAgents());
- processor.setSocketBuffer(proto.getSocketBuffer());
- processor.setMaxSavePostSize(proto.getMaxSavePostSize());
- processor.setServer(proto.getServer());
+ proto.configureProcessor(processor);
+ // APR specific configuration
processor.setClientCertProvider(proto.getClientCertProvider());
register(processor);
return processor;
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=1623458&r1=1623457&r2=1623458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Mon Sep
8 18:47:13 2014
@@ -250,20 +250,7 @@ public class Http11Nio2Protocol extends
proto.getMaxHttpHeaderSize(), (Nio2Endpoint)
proto.endpoint,
proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
proto.getMaxSwallowSize());
- processor.setAdapter(proto.getAdapter());
- processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setConnectionUploadTimeout(
- proto.getConnectionUploadTimeout());
- processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
- processor.setCompressionMinSize(proto.getCompressionMinSize());
- processor.setCompression(proto.getCompression());
-
processor.setNoCompressionUserAgents(proto.getNoCompressionUserAgents());
-
processor.setCompressableMimeTypes(proto.getCompressableMimeTypes());
- processor.setRestrictedUserAgents(proto.getRestrictedUserAgents());
- processor.setSocketBuffer(proto.getSocketBuffer());
- processor.setMaxSavePostSize(proto.getMaxSavePostSize());
- processor.setServer(proto.getServer());
+ proto.configureProcessor(processor);
register(processor);
return processor;
}
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=1623458&r1=1623457&r2=1623458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Sep
8 18:47:13 2014
@@ -282,20 +282,7 @@ public class Http11NioProtocol extends A
proto.getMaxHttpHeaderSize(), (NioEndpoint)proto.endpoint,
proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
proto.getMaxSwallowSize());
- processor.setAdapter(proto.getAdapter());
- processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setConnectionUploadTimeout(
- proto.getConnectionUploadTimeout());
- processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
- processor.setCompressionMinSize(proto.getCompressionMinSize());
- processor.setCompression(proto.getCompression());
-
processor.setNoCompressionUserAgents(proto.getNoCompressionUserAgents());
-
processor.setCompressableMimeTypes(proto.getCompressableMimeTypes());
- processor.setRestrictedUserAgents(proto.getRestrictedUserAgents());
- processor.setSocketBuffer(proto.getSocketBuffer());
- processor.setMaxSavePostSize(proto.getMaxSavePostSize());
- processor.setServer(proto.getServer());
+ proto.configureProcessor(processor);
register(processor);
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1623458&r1=1623457&r2=1623458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Mon Sep 8
18:47:13 2014
@@ -188,22 +188,9 @@ public class Http11Protocol extends Abst
proto.getMaxHttpHeaderSize(), (JIoEndpoint)proto.endpoint,
proto.getMaxTrailerSize(),proto.getMaxExtensionSize(),
proto.getMaxSwallowSize());
- processor.setAdapter(proto.getAdapter());
- processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
- processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
- processor.setConnectionUploadTimeout(
- proto.getConnectionUploadTimeout());
- processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
- processor.setCompressionMinSize(proto.getCompressionMinSize());
- processor.setCompression(proto.getCompression());
-
processor.setNoCompressionUserAgents(proto.getNoCompressionUserAgents());
-
processor.setCompressableMimeTypes(proto.getCompressableMimeTypes());
- processor.setRestrictedUserAgents(proto.getRestrictedUserAgents());
- processor.setSocketBuffer(proto.getSocketBuffer());
- processor.setMaxSavePostSize(proto.getMaxSavePostSize());
- processor.setServer(proto.getServer());
- processor.setDisableKeepAlivePercentage(
- proto.getDisableKeepAlivePercentage());
+ proto.configureProcessor(processor);
+ // BIO specific configuration
+
processor.setDisableKeepAlivePercentage(proto.getDisableKeepAlivePercentage());
register(processor);
return processor;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
