svn commit: r894805 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java

[markt]

Author: markt
Date: Thu Dec 31 10:46:24 2009
New Revision: 894805

URL: http://svn.apache.org/viewvc?rev=894805&view=rev
Log:
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

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=894805&r1=894804&r2=894805&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Dec 
31 10:46:24 2009
@@ -30,6 +30,7 @@
 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 @@
  * @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 @@
         }
 
         if (connector.getXpoweredBy()) {
-            response.addHeader("X-Powered-By", "Servlet/2.5");
+            response.addHeader("X-Powered-By", POWERED_BY);
         }
 
         boolean comet = false;



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