Changeset 33991
- Timestamp:
- 2020-03-01T16:35:09+13:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/resources/tomcat/server_tomcat8.xml.svn
r33990 r33991 16 16 limitations under the License. 17 17 --> 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 18 25 <!-- Note: A "Server" is not itself a "Container", so you may not 19 26 define subcomponents such as "Valves" at this level. … … 59 66 --> 60 67 68 61 69 <!-- A "Connector" represents an endpoint by which requests are received 62 70 and responses are returned. Documentation at : … … 66 74 Define a non-SSL/TLS HTTP/1.1 Connector on port @localhost.port.http@ 67 75 --> 76 <!-- GSDL: We comment out the 'standard' connector in favour of the tomcatThreadPool one blow --> 77 <!-- GSDL: URIEncoding of UTF-8 param also added --> 68 78 <!-- 69 79 <Connector @http.address.restriction@ … … 73 83 URIEncoding="UTF-8" /> 74 84 --> 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 --> 78 87 <Connector executor="tomcatThreadPool" @http.address.restriction@ 79 88 port="@localhost.port.http@" protocol="HTTP/1.1" … … 85 94 noCompressionUserAgents="gozilla, traviata" 86 95 URIEncoding="UTF-8" /> 87 88 96 <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@ 89 97 This connector uses the NIO implementation. The default … … 94 102 the SSLImplementation selected. JSSE style configuration is used below. 95 103 --> 104 <!-- GSDL: URIEncoding param added, but note the connector elem itself is commented out by default --> 96 105 <!-- 97 106 <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11NioProtocol" … … 109 118 configuration is used below. 110 119 --> 120 <!-- GSDL: URIEncoding param added, but note the connector elem itself is commented out by default --> 111 121 <!-- 112 122 <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11AprProtocol" … … 121 131 </Connector> 122 132 --> 133 <!-- GSDL: Connector element aligned with Greenstone documentation for for https access, if activated --> 123 134 @https.comment.out.start@ 124 135 <Connector port="@tomcat.port.https@" protocol="org.apache.coyote.http11.Http11Protocol" … … 132 143 133 144 <!-- 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" /> 138 151 --> 139 152
Note:
See TracChangeset
for help on using the changeset viewer.