[jbossweb-commits] JBossWeb SVN: r2202 - in branches: 7.2.x/src/main/java/org/apache/catalina/connector and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2013-05-23 10:32:08 -0400 (Thu, 23 May 2013)
New Revision: 2202
Modified:
branches/7.0.x/java/org/apache/catalina/connector/Connector.java
branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java
Log:
Port the system property for allow trace.
Modified: branches/7.0.x/java/org/apache/catalina/connector/Connector.java
===================================================================
--- branches/7.0.x/java/org/apache/catalina/connector/Connector.java 2013-05-22 15:48:23
UTC (rev 2201)
+++ branches/7.0.x/java/org/apache/catalina/connector/Connector.java 2013-05-23 14:32:08
UTC (rev 2202)
@@ -65,7 +65,9 @@
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
(org.apache.tomcat.util.Constants.LOW_MEMORY) ? "true" :
"false")).booleanValue();
-
+ protected static final boolean ALLOW_TRACE =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.ALLOW_TRACE",
"false")).booleanValue();
+
protected static final boolean X_POWERED_BY =
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.X_POWERED_BY",
"false")).booleanValue();
@@ -107,7 +109,7 @@
/**
* Do we allow TRACE ?
*/
- protected boolean allowTrace = false;
+ protected boolean allowTrace = ALLOW_TRACE;
/**
Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-05-22
15:48:23 UTC (rev 2201)
+++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-05-23
14:32:08 UTC (rev 2202)
@@ -66,6 +66,8 @@
protected static final boolean X_POWERED_BY =
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.X_POWERED_BY",
"false")).booleanValue();
+ protected static final boolean ALLOW_TRACE =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.ALLOW_TRACE",
"false")).booleanValue();
protected static final String URI_ENCODING =
System.getProperty("org.apache.catalina.connector.URI_ENCODING");
@@ -102,7 +104,7 @@
/**
* Do we allow TRACE ?
*/
- protected boolean allowTrace = false;
+ protected boolean allowTrace = ALLOW_TRACE;
/**