Author: markt
Date: Wed Dec 14 11:04:55 2016
New Revision: 1774175
URL: http://svn.apache.org/viewvc?rev=1774175&view=rev
Log:
Don't duplicate storage of serverRemoveAppProvidedValues in the
Processor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.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=1774175&r1=1774174&r2=1774175&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Dec 14 11:04:55 2016
@@ -251,6 +251,14 @@ public abstract class AbstractHttp11Prot
private boolean serverRemoveAppProvidedValues = false;
+ /**
+ * Should application provider values for the HTTP Server header be
removed.
+ * Note that if {@link #server} is set, any application provided value will
+ * be over-ridden.
+ *
+ * @return {@true} if application provided values should be removed,
+ * otherwise {@false}
+ */
public boolean getServerRemoveAppProvidedValues() { return
serverRemoveAppProvidedValues; }
public void setServerRemoveAppProvidedValues(boolean
serverRemoveAppProvidedValues) {
this.serverRemoveAppProvidedValues = serverRemoveAppProvidedValues;
@@ -704,7 +712,6 @@ public abstract class AbstractHttp11Prot
processor.setCompression(getCompression());
processor.setNoCompressionUserAgents(getNoCompressionUserAgents());
processor.setCompressableMimeTypes(getCompressableMimeTypes());
-
processor.setServerRemoveAppProvidedValues(getServerRemoveAppProvidedValues());
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1774175&r1=1774174&r2=1774175&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Dec 14
11:04:55 2016
@@ -158,13 +158,6 @@ public class Http11Processor extends Abs
protected char[] hostNameC = new char[0];
- /*
- * Should application provider values for the HTTP Server header be
removed.
- * Note that if {@link #server} is set, any application provided value will
- * be over-ridden.
- */
- private boolean serverRemoveAppProvidedValues = false;
-
/**
* Instance of the new protocol to use after the HTTP connection has been
* upgraded.
@@ -321,11 +314,6 @@ public class Http11Processor extends Abs
}
- public void setServerRemoveAppProvidedValues(boolean
serverRemoveAppProvidedValues) {
- this.serverRemoveAppProvidedValues = serverRemoveAppProvidedValues;
- }
-
-
/**
* Check if the resource could be compressed, if the client supports it.
*/
@@ -1101,7 +1089,7 @@ public class Http11Processor extends Abs
// Add server header
String server = protocol.getServer();
if (server == null) {
- if (serverRemoveAppProvidedValues) {
+ if (protocol.getServerRemoveAppProvidedValues()) {
headers.removeHeader("server");
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
