Changeset 33990

Show
Ignore:
Timestamp:
01.03.2020 16:29:34 (4 weeks 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/resources/tomcat/server_tomcat8.xml.svn

    r33989 r33990  
    6868    <!-- 
    6969    <Connector @http.address.restriction@ 
    70            port="@localhost.port.http@"  protocol="HTTP/1.1" 
     70               port="@localhost.port.http@"  protocol="HTTP/1.1" 
    7171               connectionTimeout="20000" 
    7272               redirectPort="@https.redirect.port@" 
    73                URIEncoding="UTF-8" /> 
     73               URIEncoding="UTF-8" /> 
    7474    --> 
    7575    <!-- A "Connector" using the shared thread pool-->     
     
    8484           compressableMimeType="text/html,text/xml,text/css,text/xsl,text/javascript" 
    8585           noCompressionUserAgents="gozilla, traviata" 
    86                URIEncoding="UTF-8" 
    87            /> 
     86               URIEncoding="UTF-8" /> 
    8887     
    89     <!-- Define a SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ 
     88    <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ 
    9089         This connector uses the NIO implementation. The default 
    9190         SSLImplementation will depend on the presence of the APR/native 
     
    104103    </Connector> 
    105104    --> 
    106     <!-- Define a SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ with HTTP/2 
     105    <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ with HTTP/2 
    107106         This connector uses the APR/native implementation which always uses 
    108107         OpenSSL for TLS. 
     
    112111    <!-- 
    113112    <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11AprProtocol" 
    114                maxThreads="150" SSLEnabled="true" URIEncoding="UTF-8" > 
     113               maxThreads="150" SSLEnabled="true" URIEncoding="UTF-8"> 
    115114        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> 
    116115        <SSLHostConfig> 
     
    128127            keystorePass="@keystore.pass@" 
    129128            clientAuth="false" sslProtocol="TLS" 
    130         keystoreType="@keystore.type@" 
    131         URIEncoding="UTF-8" /> 
     129            keystoreType="@keystore.type@" 
     130            URIEncoding="UTF-8" /> 
    132131    @https.comment.out.end@ 
    133132 
    134133    <!-- Define an AJP 1.3 Connector on port @tomcat.ajp.port@ --> 
    135134    <!-- GSDL: In a default setup, AJP is not used => so not needed. Commented out to avoid unnecessary security risk --> 
     135    <!-- GSDL: Note, starting in Tomcat 8.5.51, Apache started commenting out the AJP block by default themselves --> 
    136136    <!-- 
    137137    <Connector port="@tomcat.ajp.port@" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="@https.redirect.port@" /> 
    138138    --> 
    139  
    140139 
    141140    <!-- An Engine represents the entry point (within Catalina) that processes