svn commit: r1774174 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Protocol.java Http11Processor.java

[markt]

Author: markt
Date: Wed Dec 14 11:04:48 2016
New Revision: 1774174

URL: http://svn.apache.org/viewvc?rev=1774174&view=rev
Log:
Don't duplicate storage of server 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=1774174&r1=1774173&r2=1774174&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:48 2016
@@ -238,11 +238,13 @@ public abstract class AbstractHttp11Prot
     }
 
 
-    /**
-     * Server header.
-     */
     private String server;
     public String getServer() { return server; }
+    /**
+     * Set the server header name.
+     *
+     * @param server The new value to use for the server header
+     */
     public void setServer( String server ) {
         this.server = server;
     }
@@ -702,7 +704,6 @@ public abstract class AbstractHttp11Prot
         processor.setCompression(getCompression());
         processor.setNoCompressionUserAgents(getNoCompressionUserAgents());
         processor.setCompressableMimeTypes(getCompressableMimeTypes());
-        processor.setServer(getServer());
         
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=1774174&r1=1774173&r2=1774174&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:48 2016
@@ -158,12 +158,6 @@ public class Http11Processor extends Abs
     protected char[] hostNameC = new char[0];
 
 
-    /**
-     * Allow a customized the server header for the tin-foil hat folks.
-     */
-    private String server = null;
-
-
     /*
      * Should application provider values for the HTTP Server header be 
removed.
      * Note that if {@link #server} is set, any application provided value will
@@ -327,20 +321,6 @@ public class Http11Processor extends Abs
     }
 
 
-    /**
-     * Set the server header name.
-     *
-     * @param server The new value to use for the server header
-     */
-    public void setServer(String server) {
-        if (server == null || server.equals("")) {
-            this.server = null;
-        } else {
-            this.server = server;
-        }
-    }
-
-
     public void setServerRemoveAppProvidedValues(boolean 
serverRemoveAppProvidedValues) {
         this.serverRemoveAppProvidedValues = serverRemoveAppProvidedValues;
     }
@@ -1119,6 +1099,7 @@ public class Http11Processor extends Abs
         }
 
         // Add server header
+        String server = protocol.getServer();
         if (server == null) {
             if (serverRemoveAppProvidedValues) {
                 headers.removeHeader("server");



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