Author: markt
Date: Wed Dec 14 11:06:09 2016
New Revision: 1774185
URL: http://svn.apache.org/viewvc?rev=1774185&view=rev
Log:
Don't duplicate storage of tomcatAuthorization in the Processor
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1774185&r1=1774184&r2=1774185&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Dec 14
11:06:09 2016
@@ -125,11 +125,14 @@ public abstract class AbstractAjpProtoco
}
+ private boolean tomcatAuthorization = false;
/**
* Should authentication be done in the native web server layer and
* authorization in the Servlet container?
+ *
+ * @return {@code true} if authorization should be performed by Tomcat,
+ * otherwise {@code false}
*/
- private boolean tomcatAuthorization = false;
public boolean getTomcatAuthorization() { return tomcatAuthorization; }
public void setTomcatAuthorization(boolean tomcatAuthorization) {
this.tomcatAuthorization = tomcatAuthorization;
@@ -189,7 +192,6 @@ public abstract class AbstractAjpProtoco
protected Processor createProcessor() {
AjpProcessor processor = new AjpProcessor(this);
processor.setAdapter(getAdapter());
- processor.setTomcatAuthorization(getTomcatAuthorization());
processor.setRequiredSecret(requiredSecret);
processor.setKeepAliveTimeout(getKeepAliveTimeout());
processor.setClientCertProvider(getClientCertProvider());
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1774185&r1=1774184&r2=1774185&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Dec 14
11:06:09 2016
@@ -290,16 +290,6 @@ public class AjpProcessor extends Abstra
/**
- * Use Tomcat authorization ?
- */
- private boolean tomcatAuthorization = false;
- public boolean getTomcatAuthorization() { return tomcatAuthorization; }
- public void setTomcatAuthorization(boolean tomcatAuthorization) {
- this.tomcatAuthorization = tomcatAuthorization;
- }
-
-
- /**
* Required secret.
*/
private String requiredSecret = null;
@@ -797,6 +787,7 @@ public class AjpProcessor extends Abstra
break;
case Constants.SC_A_REMOTE_USER :
+ boolean tomcatAuthorization =
protocol.getTomcatAuthorization();
if (tomcatAuthorization ||
!protocol.getTomcatAuthentication()) {
// Implies tomcatAuthentication == false
requestHeaderMessage.getBytes(request.getRemoteUser());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
