Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

CONFSERVER-59318: Allow setting maxHttpHeaderSize

Browse Source
This commit is contained in:
Dave Chevell 2020-03-18 18:06:22 +11:00
parent f99edfada3
commit 195cd45189
No known key found for this signature in database
GPG Key ID: 279DF1B52C7C44DC
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -129,6 +129,7 @@ see https://tomcat.apache.org/tomcat-7.0-doc/config/index.html.
* `ATL_TOMCAT_ENABLELOOKUPS` (default: false) * `ATL_TOMCAT_ENABLELOOKUPS` (default: false)
* `ATL_TOMCAT_PROTOCOL` (default: HTTP/1.1) * `ATL_TOMCAT_PROTOCOL` (default: HTTP/1.1)
* `ATL_TOMCAT_ACCEPTCOUNT` (default: 10) * `ATL_TOMCAT_ACCEPTCOUNT` (default: 10)
* `ATL_TOMCAT_MAXHTTPHEADERSIZE` (default: 8192)
## JVM configuration ## JVM configuration
@ -422,7 +423,7 @@ in the running container:
# Support # Support
For product support, go to For product support, go to
[support.atlassian.com](https://support.atlassian.com/confluence-server/). [support.atlassian.com](https://support.atlassian.com/confluence-server/).
Note that these images are built on the [AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to Note that these images are built on the [AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to
Confluence 6.13 OpenJDK was not a supported platform. See [the 6.13 Confluence 6.13 OpenJDK was not a supported platform. See [the 6.13

4
config/server.xml.j2
View File

@ -28,7 +28,7 @@
relaxedPathChars="[]|" relaxedPathChars="[]|"
relaxedQueryChars="[]|{}^\`"<>" relaxedQueryChars="[]|{}^\`"<>"
bindOnInit="false" bindOnInit="false"
maxHttpHeaderSize="8192" maxHttpHeaderSize="{{ atl_tomcat_maxhttpheadersize | default('8192') }}"
useBodyEncodingForURI="true" useBodyEncodingForURI="true"
disableUploadTimeout="true" /> disableUploadTimeout="true" />
@ -50,7 +50,7 @@
<Manager pathname=""/> <Manager pathname=""/>
<Valve className="org.apache.catalina.valves.StuckThreadDetectionValve" <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
threshold="60"/> threshold="60"/>
{% if atl_tomcat_access_log == 'true' %} {% if atl_tomcat_access_log == 'true' %}
<Valve className="org.apache.catalina.valves.AccessLogValve" <Valve className="org.apache.catalina.valves.AccessLogValve"
requestAttributesEnabled="true" requestAttributesEnabled="true"
directory="logs" directory="logs"

3
tests/test_image.py
View File

@ -62,6 +62,7 @@ def test_server_xml_defaults(docker_cli, image):
assert connector.get('scheme') == 'http' assert connector.get('scheme') == 'http'
assert connector.get('proxyName') == '' assert connector.get('proxyName') == ''
assert connector.get('proxyPort') == '' assert connector.get('proxyPort') == ''
assert connector.get('maxHttpHeaderSize') == '8192'
def test_server_xml_catalina_fallback(docker_cli, image): def test_server_xml_catalina_fallback(docker_cli, image):
environment = { environment = {
@ -99,6 +100,7 @@ def test_server_xml_params(docker_cli, image):
'ATL_TOMCAT_SCHEME': 'https', 'ATL_TOMCAT_SCHEME': 'https',
'ATL_PROXY_NAME': 'conf.atlassian.com', 'ATL_PROXY_NAME': 'conf.atlassian.com',
'ATL_PROXY_PORT': '443', 'ATL_PROXY_PORT': '443',
'ATL_TOMCAT_MAXHTTPHEADERSIZE': '8193',
'ATL_TOMCAT_CONTEXTPATH': '/myconf', 'ATL_TOMCAT_CONTEXTPATH': '/myconf',
} }
container = run_image(docker_cli, image, environment=environment) container = run_image(docker_cli, image, environment=environment)
@ -121,6 +123,7 @@ def test_server_xml_params(docker_cli, image):
assert connector.get('scheme') == environment.get('ATL_TOMCAT_SCHEME') assert connector.get('scheme') == environment.get('ATL_TOMCAT_SCHEME')
assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME') assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME')
assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT') assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT')
assert connector.get('maxHttpHeaderSize') == environment.get('ATL_TOMCAT_MAXHTTPHEADERSIZE')
assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH') assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH')