Changeset 33990 for main/trunk/greenstone3/resources/tomcat/server_tomcat8.xml.svn

Timestamp:

2020-03-01T16:29:34+13:00 (4 years ago)

Author:

davidb

Message:

Some white-space changes for consistency with newer tomcat/conf/server.xml default configuration file, so diffing is easier to see where changes are needed

File:

• main/trunk/greenstone3/resources/tomcat/server_tomcat8.xml.svn (modified) (5 diffs)

main/trunk/greenstone3/resources/tomcat/server_tomcat8.xml.svn

@@ -68 +68 @@
     <!--
     <Connector @http.address.restriction@
-           port="@localhost.port.http@"  protocol="HTTP/1.1"
+               port="@localhost.port.http@"  protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="@https.redirect.port@"
-               URIEncoding="UTF-8" />
+               URIEncoding="UTF-8" />
     -->
     <!-- A "Connector" using the shared thread pool-->    
@@ -84 +84 @@
            compressableMimeType="text/html,text/xml,text/css,text/xsl,text/javascript"
            noCompressionUserAgents="gozilla, traviata"
-               URIEncoding="UTF-8"
-           />
+               URIEncoding="UTF-8" />
     
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@
          This connector uses the NIO implementation. The default
          SSLImplementation will depend on the presence of the APR/native
@@ -104 +103 @@
     </Connector>
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ with HTTP/2
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ with HTTP/2
          This connector uses the APR/native implementation which always uses
          OpenSSL for TLS.
@@ -112 +111 @@
     <!--
     <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" URIEncoding="UTF-8" >
+               maxThreads="150" SSLEnabled="true" URIEncoding="UTF-8">
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
@@ -128 +127 @@
             keystorePass="@keystore.pass@"
             clientAuth="false" sslProtocol="TLS"
-        keystoreType="@keystore.type@"
-        URIEncoding="UTF-8" />
+            keystoreType="@keystore.type@"
+            URIEncoding="UTF-8" />
     @https.comment.out.end@
 
     <!-- Define an AJP 1.3 Connector on port @tomcat.ajp.port@ -->
     <!-- GSDL: In a default setup, AJP is not used => so not needed. Commented out to avoid unnecessary security risk -->
+    <!-- GSDL: Note, starting in Tomcat 8.5.51, Apache started commenting out the AJP block by default themselves -->
     <!--
     <Connector port="@tomcat.ajp.port@" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="@https.redirect.port@" />
     -->
-
 
     <!-- An Engine represents the entry point (within Catalina) that processes