Re: [tomcat] branch 7.0.x updated: Reduce code duplication. Pick up allowHostHeaderMismatch setting.

2020-05-05 Thread Mark Thomas 
On 05/05/2020 11:19, ma...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch 7.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/7.0.x by this push:
>  new 1854fd4  Reduce code duplication. Pick up allowHostHeaderMismatch 
> setting.

Thsi fixes a handful of failures I am seeing after back-porting
additional tests to Tomcat 7.

I have one failure left to track down (unless CI finds any more).

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Reduce code duplication. Pick up allowHostHeaderMismatch setting.

2020-05-05 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 1854fd4  Reduce code duplication. Pick up allowHostHeaderMismatch 
setting.
1854fd4 is described below

commit 1854fd483be73879ca347e7c04e46f3c9073df2c
Author: Mark Thomas 
AuthorDate: Tue May 5 11:19:15 2020 +0100

Reduce code duplication. Pick up allowHostHeaderMismatch setting.
---
 java/org/apache/coyote/http11/Http11AprProtocol.java | 16 +---
 java/org/apache/coyote/http11/Http11NioProtocol.java | 16 +---
 java/org/apache/coyote/http11/Http11Protocol.java| 19 ++-
 3 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java 
b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 4afeac5..4f4fd4f 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -304,22 +304,8 @@ public class Http11AprProtocol extends 
AbstractHttp11Protocol {
 proto.getAllowedTrailerHeadersAsSet(), 
proto.getMaxExtensionSize(),
 proto.getMaxSwallowSize(), proto.getRelaxedPathChars(),
 proto.getRelaxedQueryChars());
-processor.setAdapter(proto.adapter);
-processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
-processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
-
processor.setConnectionUploadTimeout(proto.getConnectionUploadTimeout());
-processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
-processor.setCompressionMinSize(proto.getCompressionMinSize());
-
processor.setNoCompressionStrongETag(proto.getNoCompressionStrongETag());
-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);
 processor.setClientCertProvider(proto.getClientCertProvider());
-processor.setMaxCookieCount(proto.getMaxCookieCount());
 register(processor);
 return processor;
 }
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java 
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index c61f3a0..cd32795 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -269,21 +269,7 @@ public class Http11NioProtocol extends 
AbstractHttp11JsseProtocol {
 proto.getAllowedTrailerHeadersAsSet(), 
proto.getMaxExtensionSize(),
 proto.getMaxSwallowSize(), proto.getRelaxedPathChars(),
 proto.getRelaxedQueryChars());
-processor.setAdapter(proto.adapter);
-processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
-processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
-
processor.setConnectionUploadTimeout(proto.getConnectionUploadTimeout());
-processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
-processor.setCompressionMinSize(proto.getCompressionMinSize());
-
processor.setNoCompressionStrongETag(proto.getNoCompressionStrongETag());
-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.setMaxCookieCount(proto.getMaxCookieCount());
+proto.configureProcessor(processor);
 register(processor);
 return processor;
 }
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java 
b/java/org/apache/coyote/http11/Http11Protocol.java
index 2e59197..c2997a2 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -168,23 +168,8 @@ public class Http11Protocol extends 
AbstractHttp11JsseProtocol {
 proto.getAllowedTrailerHeadersAsSet(), 
proto.getMaxExtensionSize(),