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/10/26 12:37:27 UTC
svn commit: r1766675 - in /tomcat/trunk: java/org/apache/catalina/connector/
java/org/apache/coyote/ java/org/apache/coyote/ajp/
java/org/apache/coyote/http11/ java/org/apache/coyote/http2/
test/org/apache/coyote/http2/ webapps/docs/config/
Author: markt
Date: Wed Oct 26 12:37:27 2016
New Revision: 1766675
URL: http://svn.apache.org/viewvc?rev=1766675&view=rev
Log:
Refactor for consistency
Limits applied after the request/response has been passed to the Adaptor are configured on the Connector and obtained via the Adaptor when required.
Limits applied during initial parsing are configured on the ProtocolHandler and may be obtained from the Protocol or may be passed to the Processor etc. as required.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
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
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java
tomcat/trunk/webapps/docs/config/http2.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Wed Oct 26 12:37:27 2016
@@ -196,6 +196,12 @@ public class Connector extends Lifecycle
/**
+ * The maximum number of cookies permitted for a request. Use a value less
+ * than zero for no limit. Defaults to 200.
+ */
+ private int maxCookieCount = 200;
+
+ /**
* The maximum number of parameters (GET plus POST) which will be
* automatically parsed by the container. 10000 by default. A value of less
* than 0 means no limit.
@@ -411,6 +417,16 @@ public class Connector extends Lifecycle
}
+ public int getMaxCookieCount() {
+ return maxCookieCount;
+ }
+
+
+ public void setMaxCookieCount(int maxCookieCount) {
+ this.maxCookieCount = maxCookieCount;
+ }
+
+
/**
* @return the maximum number of parameters (GET plus POST) that will be
* automatically parsed by the container. A value of less than 0 means no
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Oct 26 12:37:27 2016
@@ -3051,6 +3051,7 @@ public class Request implements HttpServ
cookiesParsed = true;
ServerCookies serverCookies = coyoteRequest.getCookies();
+ serverCookies.setLimit(connector.getMaxCookieCount());
CookieProcessor cookieProcessor = getContext().getCookieProcessor();
cookieProcessor.parseCookieHeader(coyoteRequest.getMimeHeaders(), serverCookies);
}
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Wed Oct 26 12:37:27 2016
@@ -50,7 +50,6 @@ public abstract class AbstractProcessor
protected final Response response;
protected volatile SocketWrapperBase<?> socketWrapper = null;
protected volatile SSLSupport sslSupport;
- private int maxCookieCount = 200;
/**
@@ -533,16 +532,6 @@ public abstract class AbstractProcessor
}
- public int getMaxCookieCount() {
- return maxCookieCount;
- }
-
-
- public void setMaxCookieCount(int maxCookieCount) {
- this.maxCookieCount = maxCookieCount;
- }
-
-
@Override
public void recycle() {
errorState = ErrorState.NONE;
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Oct 26 12:37:27 2016
@@ -103,13 +103,6 @@ public abstract class AbstractProtocol<S
private AsyncTimeout asyncTimeout = null;
- /**
- * The maximum number of cookies permitted for a request. Use a value less
- * than zero for no limit. Defaults to 200.
- */
- private int maxCookieCount = 200;
-
-
public AbstractProtocol(AbstractEndpoint<S> endpoint) {
this.endpoint = endpoint;
setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
@@ -208,16 +201,6 @@ public abstract class AbstractProtocol<S
}
- public int getMaxCookieCount() {
- return maxCookieCount;
- }
-
-
- public void setMaxCookieCount(int maxCookieCount) {
- this.maxCookieCount = maxCookieCount;
- }
-
-
// ---------------------- Properties that are passed through to the EndPoint
@Override
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=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Oct 26 12:37:27 2016
@@ -192,7 +192,6 @@ public abstract class AbstractAjpProtoco
processor.setRequiredSecret(requiredSecret);
processor.setKeepAliveTimeout(getKeepAliveTimeout());
processor.setClientCertProvider(getClientCertProvider());
- processor.setMaxCookieCount(getMaxCookieCount());
return processor;
}
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=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Oct 26 12:37:27 2016
@@ -722,7 +722,6 @@ public class AjpProcessor extends Abstra
// Set this every time in case limit has been changed via JMX
headers.setLimit(endpoint.getMaxHeaderCount());
- request.getCookies().setLimit(getMaxCookieCount());
boolean contentLengthSet = false;
int hCount = requestHeaderMessage.getInt();
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=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed Oct 26 12:37:27 2016
@@ -648,7 +648,6 @@ public abstract class AbstractHttp11Prot
processor.setMaxSavePostSize(getMaxSavePostSize());
processor.setServer(getServer());
processor.setServerRemoveAppProvidedValues(getServerRemoveAppProvidedValues());
- processor.setMaxCookieCount(getMaxCookieCount());
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Oct 26 12:37:27 2016
@@ -680,7 +680,6 @@ public class Http11Processor extends Abs
keptAlive = true;
// Set this every time in case limit has been changed via JMX
request.getMimeHeaders().setLimit(endpoint.getMaxHeaderCount());
- request.getCookies().setLimit(getMaxCookieCount());
if (!inputBuffer.parseHeaders()) {
// We've read part of the request, don't recycle it
// instead associate it with the socket
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Wed Oct 26 12:37:27 2016
@@ -64,7 +64,6 @@ public class Http2Protocol implements Up
// Limits
private Set<String> allowedTrailerHeaders =
Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
- private int maxCookieCount = Constants.DEFAULT_MAX_COOKIE_COUNT;
private int maxHeaderCount = Constants.DEFAULT_MAX_HEADER_COUNT;
private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
private int maxTrailerCount = Constants.DEFAULT_MAX_TRAILER_COUNT;
@@ -110,7 +109,6 @@ public class Http2Protocol implements Up
result.setMaxConcurrentStreamExecution(getMaxConcurrentStreamExecution());
result.setInitialWindowSize(getInitialWindowSize());
result.setAllowedTrailerHeaders(allowedTrailerHeaders);
- result.setMaxCookieCount(getMaxCookieCount());
result.setMaxHeaderCount(getMaxHeaderCount());
result.setMaxHeaderSize(getMaxHeaderSize());
result.setMaxTrailerCount(getMaxTrailerCount());
@@ -240,16 +238,6 @@ public class Http2Protocol implements Up
}
- public void setMaxCookieCount(int maxCookieCount) {
- this.maxCookieCount = maxCookieCount;
- }
-
-
- public int getMaxCookieCount() {
- return maxCookieCount;
- }
-
-
public void setMaxHeaderCount(int maxHeaderCount) {
this.maxHeaderCount = maxHeaderCount;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Oct 26 12:37:27 2016
@@ -148,7 +148,6 @@ class Http2UpgradeHandler extends Abstra
// Limits
private Set<String> allowedTrailerHeaders = Collections.emptySet();
- private int maxCookieCount = Constants.DEFAULT_MAX_COOKIE_COUNT;
private int maxHeaderCount = Constants.DEFAULT_MAX_HEADER_COUNT;
private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
private int maxTrailerCount = Constants.DEFAULT_MAX_TRAILER_COUNT;
@@ -1131,16 +1130,6 @@ class Http2UpgradeHandler extends Abstra
}
- public void setMaxCookieCount(int maxCookieCount) {
- this.maxCookieCount = maxCookieCount;
- }
-
-
- public int getMaxCookieCount() {
- return maxCookieCount;
- }
-
-
public void setMaxHeaderCount(int maxHeaderCount) {
this.maxHeaderCount = maxHeaderCount;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Wed Oct 26 12:37:27 2016
@@ -97,8 +97,6 @@ class Stream extends AbstractStream impl
this.coyoteResponse.setOutputBuffer(outputBuffer);
this.coyoteRequest.setResponse(coyoteResponse);
this.coyoteRequest.protocol().setString("HTTP/2.0");
- // Configure HTTP/2 limits
- this.coyoteRequest.getCookies().setLimit(handler.getMaxCookieCount());
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java Wed Oct 26 12:37:27 2016
@@ -25,6 +25,7 @@ import java.util.Random;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.catalina.connector.Connector;
import org.apache.coyote.http2.HpackEncoder.State;
import org.apache.tomcat.util.http.MimeHeaders;
@@ -343,9 +344,8 @@ public class TestHttp2Limits extends Htt
enableHttp2();
- Http2Protocol http2Protocol =
- (Http2Protocol) getTomcatInstance().getConnector().findUpgradeProtocols()[0];
- http2Protocol.setMaxCookieCount(maxCookieCount);
+ Connector connector = getTomcatInstance().getConnector();
+ connector.setMaxCookieCount(maxCookieCount);
configureAndStartWebApplication();
openClientConnection();
Modified: tomcat/trunk/webapps/docs/config/http2.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http2.xml?rev=1766675&r1=1766674&r2=1766675&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http2.xml (original)
+++ tomcat/trunk/webapps/docs/config/http2.xml Wed Oct 26 12:37:27 2016
@@ -105,12 +105,6 @@
If not specified, the default value of <code>200</code> will be used.</p>
</attribute>
- <attribute name="maxCookieCount" required="false">
- <p>The maximum number of cookies that are permitted for a request. A value
- of less than zero means no limit. If not specified, a default value of 200
- will be used.</p>
- </attribute>
-
<attribute name="maxHeaderCount" required="false">
<p>The maximum number of headers in a request that is allowed by the
container. A request that contains more headers than the specified limit
@@ -161,6 +155,16 @@
</attributes>
+ <p>The HTTP/2 upgrade protocol will also inherit the following limits from the
+ <a href="http.html">HTTP Connector</a> it is nested with:</p>
+
+ <ul>
+ <li>maxCookieCount</li>
+ <li>maxParameterCount</li>
+ <li>maxPostSize</li>
+ <li>maxSavePostSize</li>
+ </ul>
+
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org