[jbossweb-commits] JBossWeb SVN: r2246 - branches/7.2.x/src/main/java/org/apache/coyote/ajp.
Author: tfonteyn
Date: 2013-08-14 11:12:43 -0400 (Wed, 14 Aug 2013)
New Revision: 2246
Modified:
branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java
branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java
Log:
[bz-997009] allow configuration of requiredSecret attribute on the AJP connector with a
system property
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-08-14
13:14:09 UTC (rev 2245)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-08-14
15:12:43 UTC (rev 2246)
@@ -324,7 +324,7 @@
/**
* Required secret.
*/
- protected String requiredSecret = null;
+ protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET;
public void setRequiredSecret(String requiredSecret) { this.requiredSecret =
requiredSecret; }
/**
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-08-14
13:14:09 UTC (rev 2245)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-08-14
15:12:43 UTC (rev 2246)
@@ -299,7 +299,7 @@
/**
* Required secret.
*/
- protected String requiredSecret = null;
+ protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET;
public void setRequiredSecret(String requiredSecret) { this.requiredSecret =
requiredSecret; }
/**
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java 2013-08-14 13:14:09
UTC (rev 2245)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java 2013-08-14 15:12:43
UTC (rev 2246)
@@ -46,7 +46,9 @@
public static final boolean DEFAULT_TCP_NO_DELAY = true;
public static final boolean DEFAULT_TOMCAT_AUTHENTICATION =
Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.DEFAULT_TOMCAT_AUTHENTICATION",
"true")).booleanValue();
-
+ public static final String DEFAULT_REQUIRED_SECRET =
+
System.getProperty("org.apache.coyote.ajp.DEFAULT_REQUIRED_SECRET");
+
// Prefix codes for message types from server to container
public static final byte JK_AJP13_FORWARD_REQUEST = 2;
public static final byte JK_AJP13_SHUTDOWN = 7;