From ebef0ad94f322b9c7b18eb9b60bd3300ac95a91e Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 31 Dec 2009 10:46:24 +0000 Subject: [PATCH] Update X-Powered-By header for Servlet 3.0 / JSP 2.2 and add additional information as suggested by the Servlet Spec and https://issues.apache.org/bugzilla/show_bug.cgi?id=48006 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@894805 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/CoyoteAdapter.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index c1ed81e41..ed4c8b589 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -30,6 +30,7 @@ import org.apache.catalina.Wrapper; import org.apache.tomcat.util.res.StringManager; import org.apache.catalina.comet.CometEvent; import org.apache.catalina.core.AsyncContextImpl; +import org.apache.catalina.util.ServerInfo; import org.apache.catalina.util.URLEncoder; import org.apache.coyote.ActionCode; import org.apache.coyote.Adapter; @@ -54,9 +55,13 @@ import org.apache.tomcat.util.net.SocketStatus; * @version $Revision$ $Date$ */ -public class CoyoteAdapter - implements Adapter - { +public class CoyoteAdapter implements Adapter { + + private static final String POWERED_BY = "Servlet/3.0 JSP/2.2 " + + "(" + ServerInfo.getServerInfo() + " Java/" + + System.getProperty("java.vm.vendor") + "/" + + System.getProperty("java.runtime.version") + ")"; + private static final Log log = LogFactory.getLog(CoyoteAdapter.class); // -------------------------------------------------------------- Constants @@ -367,7 +372,7 @@ public class CoyoteAdapter } if (connector.getXpoweredBy()) { - response.addHeader("X-Powered-By", "Servlet/2.5"); + response.addHeader("X-Powered-By", POWERED_BY); } boolean comet = false; -- 2.11.0