Author: remy.maucherat(a)jboss.com
Date: 2009-10-16 13:23:00 -0400 (Fri, 16 Oct 2009)
New Revision: 1201
Modified:
trunk/java/org/apache/catalina/connector/Connector.java
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
trunk/res/jboss/org/apache/catalina/startup/catalina.properties
Log:
- Take over the powered by header.
Modified: trunk/java/org/apache/catalina/connector/Connector.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Connector.java 2009-10-16 13:08:15 UTC (rev
1200)
+++ trunk/java/org/apache/catalina/connector/Connector.java 2009-10-16 17:23:00 UTC (rev
1201)
@@ -64,6 +64,10 @@
public static final boolean RECYCLE_FACADES =
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
"false")).booleanValue();
+
+ protected static final boolean X_POWERED_BY =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.X_POWERED_BY",
"false")).booleanValue();
+
// ------------------------------------------------------------ Constructor
@@ -115,10 +119,10 @@
protected boolean enableLookups = false;
- /*
+ /**
* Is generation of X-Powered-By response header enabled/disabled?
*/
- protected boolean xpoweredBy = false;
+ protected boolean xpoweredBy = X_POWERED_BY;
/**
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-10-16 13:08:15 UTC
(rev 1200)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-10-16 17:23:00 UTC
(rev 1201)
@@ -90,6 +90,10 @@
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH",
"false")).booleanValue();
+ protected static final String X_POWERED_BY =
+
System.getProperty("org.apache.catalina.connector.CoyoteAdapter.X_POWERED_BY",
"Servlet/3.0; JBossWeb-3");
+
+
// ----------------------------------------------------------- Constructors
@@ -343,7 +347,7 @@
}
if (connector.getXpoweredBy()) {
- response.addHeader("X-Powered-By", "Servlet/3.0");
+ response.addHeader("X-Powered-By", X_POWERED_BY);
}
boolean event = false;
Modified: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2009-10-16 13:08:15
UTC (rev 1200)
+++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2009-10-16 17:23:00
UTC (rev 1201)
@@ -2,7 +2,9 @@
org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true
org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
+org.apache.catalina.connector.Connector.X_POWERED_BY=true
org.apache.catalina.connector.Request.SESSION_ID_CHECK=true
+org.apache.catalina.connector.CoyoteAdapter.X_POWERED_BY=Servlet/3.0; JBossAS-6
org.apache.catalina.core.CONFIGBASE_MKDIRS=false
org.apache.catalina.core.StandardHost.autoDeploy=false
org.apache.catalina.core.StandardHost.configClass=org.jboss.web.tomcat.service.deployers.JBossContextConfig
Show replies by date