You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/14 11:06:02 UTC
svn commit: r1774184 - in /tomcat/trunk/java/org/apache/coyote:
ajp/AbstractAjpProtocol.java ajp/AjpProcessor.java
http11/AbstractHttp11Protocol.java
Author: markt
Date: Wed Dec 14 11:06:02 2016
New Revision: 1774184
URL: http://svn.apache.org/viewvc?rev=1774184&view=rev
Log:
Fix Javadoc errors
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.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=1774184&r1=1774183&r2=1774184&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:02 2016
@@ -111,11 +111,14 @@ public abstract class AbstractAjpProtoco
}
+ private boolean tomcatAuthentication = true;
/**
* Should authentication be done in the native web server layer,
* or in the Servlet container ?
+ *
+ * @return {@code true} if authentication should be performed by Tomcat,
+ * otherwise {@code false}
*/
- private boolean tomcatAuthentication = true;
public boolean getTomcatAuthentication() { return tomcatAuthentication; }
public void setTomcatAuthentication(boolean tomcatAuthentication) {
this.tomcatAuthentication = tomcatAuthentication;
@@ -186,7 +189,6 @@ public abstract class AbstractAjpProtoco
protected Processor createProcessor() {
AjpProcessor processor = new AjpProcessor(this);
processor.setAdapter(getAdapter());
- processor.setTomcatAuthentication(getTomcatAuthentication());
processor.setTomcatAuthorization(getTomcatAuthorization());
processor.setRequiredSecret(requiredSecret);
processor.setKeepAliveTimeout(getKeepAliveTimeout());
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=1774184&r1=1774183&r2=1774184&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:02 2016
@@ -290,16 +290,6 @@ public class AjpProcessor extends Abstra
/**
- * Use Tomcat authentication ?
- */
- private boolean tomcatAuthentication = true;
- public boolean getTomcatAuthentication() { return tomcatAuthentication; }
- public void setTomcatAuthentication(boolean tomcatAuthentication) {
- this.tomcatAuthentication = tomcatAuthentication;
- }
-
-
- /**
* Use Tomcat authorization ?
*/
private boolean tomcatAuthorization = false;
@@ -807,7 +797,7 @@ public class AjpProcessor extends Abstra
break;
case Constants.SC_A_REMOTE_USER :
- if (tomcatAuthorization || !tomcatAuthentication) {
+ if (tomcatAuthorization || !protocol.getTomcatAuthentication()) {
// Implies tomcatAuthentication == false
requestHeaderMessage.getBytes(request.getRemoteUser());
request.setRemoteUserNeedsAuthorization(tomcatAuthorization);
@@ -818,7 +808,7 @@ public class AjpProcessor extends Abstra
break;
case Constants.SC_A_AUTH_TYPE :
- if (tomcatAuthentication) {
+ if (protocol.getTomcatAuthentication()) {
// ignore server
requestHeaderMessage.getBytes(tmpMB);
} else {
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1774184&r1=1774183&r2=1774184&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed Dec 14 11:06:02 2016
@@ -105,9 +105,11 @@ public abstract class AbstractHttp11Prot
* buffered while an SSL handshake takes place to obtain the certificate. A
* similar buffering is required during FDORM auth.
*
- * @param msps The maximum size POST body to buffer in bytes
+ * @param maxSavePostSize The maximum size POST body to buffer in bytes
*/
- public void setMaxSavePostSize(int valueI) { maxSavePostSize = valueI; }
+ public void setMaxSavePostSize(int maxSavePostSize) {
+ this.maxSavePostSize = maxSavePostSize;
+ }
/**
@@ -120,8 +122,10 @@ public abstract class AbstractHttp11Prot
private int connectionUploadTimeout = 300000;
/**
- * Specifies a different (usually longer) connection timeout during data
+ * Specifies a different (usually longer) connection timeout during data
* upload. Default is 5 minutes as in Apache HTTPD server.
+ *
+ * @return The timeout in milliseconds
*/
public int getConnectionUploadTimeout() { return connectionUploadTimeout; }
/**
@@ -208,6 +212,8 @@ public abstract class AbstractHttp11Prot
/**
* Obtain the String form of the regular expression that defines the user
* agents to not use gzip with.
+ *
+ * @return The regular expression as a String
*/
public String getNoCompressionUserAgents() {
if (noCompressionUserAgents == null) {
@@ -280,6 +286,8 @@ public abstract class AbstractHttp11Prot
/**
* Get the string form of the regular expression that defines the User
* agents which should be restricted to HTTP/1.0 support.
+ *
+ * @return The regular expression as a String
*/
public String getRestrictedUserAgents() {
if (restrictedUserAgents == null) {
@@ -315,7 +323,7 @@ public abstract class AbstractHttp11Prot
*
* @param server The new value to use for the server header
*/
- public void setServer( String server ) {
+ public void setServer(String server) {
this.server = server;
}
@@ -326,8 +334,8 @@ public abstract class AbstractHttp11Prot
* Note that if {@link #server} is set, any application provided value will
* be over-ridden.
*
- * @return {@true} if application provided values should be removed,
- * otherwise {@false}
+ * @return {@code true} if application provided values should be removed,
+ * otherwise {@code false}
*/
public boolean getServerRemoveAppProvidedValues() { return serverRemoveAppProvidedValues; }
public void setServerRemoveAppProvidedValues(boolean serverRemoveAppProvidedValues) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org