Align Tomcat configs for ODK and Mifos with Tomcat upstream

This commit is contained in:
Disassembler 2020-11-08 22:35:00 +01:00
parent c50e67dbc0
commit 6f52ea0f1a
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 16 additions and 8 deletions

View File

@ -79,7 +79,7 @@
connectionTimeout="20000" connectionTimeout="20000"
redirectPort="8443" /> redirectPort="8443" />
--> -->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native SSLImplementation will depend on the presence of the APR/native
library and the useOpenSSL attribute of the library and the useOpenSSL attribute of the
@ -96,7 +96,7 @@
</SSLHostConfig> </SSLHostConfig>
</Connector> </Connector>
--> -->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2 <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
This connector uses the APR/native implementation which always uses This connector uses the APR/native implementation which always uses
OpenSSL for TLS. OpenSSL for TLS.
Either JSSE or OpenSSL style configuration may be used. OpenSSL style Either JSSE or OpenSSL style configuration may be used. OpenSSL style
@ -116,8 +116,12 @@
--> -->
<!-- Define an AJP 1.3 Connector on port 8009 --> <!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> <!--
<Connector protocol="AJP/1.3"
address="::1"
port="8009"
redirectPort="8443" />
-->
<!-- An Engine represents the entry point (within Catalina) that processes <!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone every request. The Engine implementation for Tomcat stand alone

View File

@ -79,7 +79,7 @@
connectionTimeout="20000" connectionTimeout="20000"
redirectPort="8443" /> redirectPort="8443" />
--> -->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native SSLImplementation will depend on the presence of the APR/native
library and the useOpenSSL attribute of the library and the useOpenSSL attribute of the
@ -96,7 +96,7 @@
</SSLHostConfig> </SSLHostConfig>
</Connector> </Connector>
--> -->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2 <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
This connector uses the APR/native implementation which always uses This connector uses the APR/native implementation which always uses
OpenSSL for TLS. OpenSSL for TLS.
Either JSSE or OpenSSL style configuration may be used. OpenSSL style Either JSSE or OpenSSL style configuration may be used. OpenSSL style
@ -116,8 +116,12 @@
--> -->
<!-- Define an AJP 1.3 Connector on port 8009 --> <!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> <!--
<Connector protocol="AJP/1.3"
address="::1"
port="8009"
redirectPort="8443" />
-->
<!-- An Engine represents the entry point (within Catalina) that processes <!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone every request. The Engine implementation for Tomcat stand alone