Changeset 33991

Show
Ignore:
Timestamp:
01.03.2020 16:35:09 (4 weeks ago)
Author:
davidb
Message:

A version of the tomcat/conf/server.xml file that is better aligned with more recent tomcat v8.5.xx versions. This alignment is about how the elements are laid out, and does not acutally change any of the values in use.

Files:
1 modified

Legend:

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

    r33990 r33991  
    1616  limitations under the License. 
    1717--> 
     18<!-- GSDL: Notes 
     19  To turn a new default 'conf/server.xml' into a server_tomcatN.xml.svn 
     20  Perform the following substitutions: 
     21    8443 => @https.redirect.port@ 
     22    8009 => @tomcat.ajp.port@ 
     23--> 
     24 
    1825<!-- Note:  A "Server" is not itself a "Container", so you may not 
    1926     define subcomponents such as "Valves" at this level. 
     
    5966    --> 
    6067 
     68 
    6169    <!-- A "Connector" represents an endpoint by which requests are received 
    6270         and responses are returned. Documentation at : 
     
    6674         Define a non-SSL/TLS HTTP/1.1 Connector on port @localhost.port.http@ 
    6775    --> 
     76    <!-- GSDL: We comment out the 'standard' connector in favour of the tomcatThreadPool one blow --> 
     77    <!-- GSDL: URIEncoding of UTF-8 param also added --> 
    6878    <!-- 
    6979    <Connector @http.address.restriction@ 
     
    7383               URIEncoding="UTF-8" /> 
    7484    --> 
    75     <!-- A "Connector" using the shared thread pool-->     
    76     <!-- In Greenstone we comment out the above default connector for Tomcat 
    77      in preference of the shared thread pool -->     
     85    <!-- A "Connector" using the shared thread pool--> 
     86    <!-- GSDL: Additional params added after redirectPort --> 
    7887    <Connector executor="tomcatThreadPool" @http.address.restriction@ 
    7988           port="@localhost.port.http@" protocol="HTTP/1.1" 
     
    8594           noCompressionUserAgents="gozilla, traviata" 
    8695               URIEncoding="UTF-8" /> 
    87      
    8896    <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ 
    8997         This connector uses the NIO implementation. The default 
     
    94102         the SSLImplementation selected. JSSE style configuration is used below. 
    95103    --> 
     104    <!-- GSDL: URIEncoding param added, but note the connector elem itself is commented out by default --> 
    96105    <!-- 
    97106    <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11NioProtocol" 
     
    109118         configuration is used below. 
    110119    --> 
     120    <!-- GSDL: URIEncoding param added, but note the connector elem itself is commented out by default --> 
    111121    <!-- 
    112122    <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11AprProtocol" 
     
    121131    </Connector> 
    122132    --> 
     133    <!-- GSDL: Connector element aligned with Greenstone documentation for for https access, if activated --> 
    123134    @https.comment.out.start@ 
    124135    <Connector port="@tomcat.port.https@" protocol="org.apache.coyote.http11.Http11Protocol" 
     
    132143 
    133144    <!-- Define an AJP 1.3 Connector on port @tomcat.ajp.port@ --> 
    134     <!-- 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 --> 
    136     <!-- 
    137     <Connector port="@tomcat.ajp.port@" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="@https.redirect.port@" /> 
     145    <!-- 
     146    <Connector protocol="AJP/1.3" 
     147               address="::1" 
     148               port="@tomcat.ajp.port@"         
     149               redirectPort="@https.redirect.port@" 
     150               URIEncoding="UTF-8" /> 
    138151    --> 
    139152