This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 2b8b27b742 Make max HTTP header size descriptions more specific 2b8b27b742 is described below commit 2b8b27b74272a4fc280686cbc1133966d95fb861 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu May 26 11:53:41 2022 +0100 Make max HTTP header size descriptions more specific --- webapps/docs/changelog.xml | 5 +++++ webapps/docs/config/http.xml | 24 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 83a418b72c..7908a14682 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,6 +155,11 @@ application to reflect changes in required Java version and source repository. (markt) </fix> + <fix> + Documentation. Make the description of the HTTP/1.1 configuration + attributes that control the maximum allowed HTTP header size more + specific. (markt) + </fix> </changelog> </subsection> <subsection name="Tribes"> diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index fd393a777c..412cf50ded 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -518,20 +518,28 @@ </attribute> <attribute name="maxHttpHeaderSize" required="false"> - <p>The maximum size of the request and response HTTP header, specified - in bytes. If not specified, this attribute is set to 8192 (8 KB).</p> + <p>Provides the default value for + <strong>maxHttpRequestHeaderSize</strong> and + <strong>maxHttpResponseHeaderSize</strong>. If not specified, this + attribute is set to 8192 (8 KB).</p> </attribute> <attribute name="maxHttpRequestHeaderSize" required="false"> - <p>The maximum size of the request HTTP header, specified - in bytes. If not specified, this attribute is set to the value of - the <code>maxHttpHeaderSize</code> attribute.</p> + <p>The maximum permitted size of the request line and headers associated + with an HTTP request, specified in bytes. This is compared to the number + of bytes received so includes line terminators and whitespace as well as + the request line, header names and header values. If not specified, this + attribute is set to the value of the <code>maxHttpHeaderSize</code> + attribute.</p> </attribute> <attribute name="maxHttpResponseHeaderSize" required="false"> - <p>The maximum size of the response HTTP header, specified - in bytes. If not specified, this attribute is set to the value of - the <code>maxHttpHeaderSize</code> attribute.</p> + <p>The maximum permitted size of the response line and headers associated + with an HTTP response, specified in bytes. This is compared to the number + of bytes written so includes line terminators and whitespace as well as + the status line, header names and header values. If not specified, this + attribute is set to the value of the <code>maxHttpHeaderSize</code> + attribute.</p> </attribute> <attribute name="maxKeepAliveRequests" required="false"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org