Skip to content

Commit 1aa6c66

Browse files
committed
DOCKER-462 Changed defaults of new tomcat settings
1 parent 7aca051 commit 1aa6c66

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ in the following tables, are the values that are used when the environment varia
7373
| TOMCAT_MAX_HTTP_HEADER_SIZE | 32768 | Maximum http header size |
7474
| TOMCAT_MAX_THREADS | 200 | Maximum number of threads |
7575
| TOMCAT_ALLOW_CASUAL_MULTIPART_PARSING | false | Set to true if Tomcat should automatically parse multipart/form-data request bodies when HttpServletRequest.getPart* or HttpServletRequest.getParameter* is called. The default is false. |
76-
| TOMCAT_ALLOW_MULTIPLE_LEADING_FORWARD_SLASH_IN_PATH | true | Tomcat will collapse multiple leading / characters at the start of the return value for HttpServletRequest#getContextPath() to a single /. The default is true. |
77-
| TOMCAT_CROSS_CONTEXT | true | Set to true (the default) if you want calls within this application to ServletContext.getContext() to successfully return a request dispatcher for other web applications running on this virtual host. Set to false in security conscious environments, to make getContext() always return null. |
76+
| TOMCAT_ALLOW_MULTIPLE_LEADING_FORWARD_SLASH_IN_PATH | false | Tomcat will collapse multiple leading / characters at the start of the return value for HttpServletRequest#getContextPath() to a single /. The default is false. |
77+
| TOMCAT_CROSS_CONTEXT | false | Set to true if you want calls within this application to ServletContext.getContext() to successfully return a request dispatcher for other web applications running on this virtual host. Set to false (the default) in security conscious environments, to make getContext() always return null. |
7878
| JAVA_XMS | | -Xmx |
7979
| JAVA_XMX | | -Xms |
8080
| DEBUG | false | -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n |

tomcat-base/src/shared/main/java/eu/xenit/alfresco/tomcat/embedded/config/DefaultConfigurationProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public TomcatConfiguration getConfiguration(TomcatConfiguration baseConfiguratio
2020
baseConfiguration.setSharedClasspathDir("/usr/local/tomcat/shared/classes");
2121
baseConfiguration.setTomcatCacheMaxSize(100000);
2222
baseConfiguration.setAllowCasualMultipartParsing(false);
23-
baseConfiguration.setAllowMultipleLeadingForwardSlashInPath(true);
24-
baseConfiguration.setCrossContext(true);
23+
baseConfiguration.setAllowMultipleLeadingForwardSlashInPath(false);
24+
baseConfiguration.setCrossContext(false);
2525
return baseConfiguration;
2626
}
2727
}

tomcat-base/src/shared/test/java/eu/xenit/alfresco/tomcat/embedded/config/DefaultConfigurationProviderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ void testGetConfiguration() {
2626
expected.setSharedClasspathDir("/usr/local/tomcat/shared/classes");
2727
expected.setTomcatCacheMaxSize(100000);
2828
expected.setAllowCasualMultipartParsing(false);
29-
expected.setAllowMultipleLeadingForwardSlashInPath(true);
30-
expected.setCrossContext(true);
29+
expected.setAllowMultipleLeadingForwardSlashInPath(false);
30+
expected.setCrossContext(false);
3131
assertEquals(configuration, expected);
3232
}
3333

0 commit comments

Comments
 (0)