Changeset 38877


Ignore:
Timestamp:
2024-03-26T13:51:58+13:00 (8 weeks ago)
Author:
kjdon
Message:

updated these to match tomcat 5.8.99

Location:
main/trunk/greenstone3/resources/tomcat
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r33992 r38877  
    1515  See the License for the specific language governing permissions and
    1616  limitations under the License.
    17 -->
     17  -->
    1818<!-- GSDL: Notes
    1919  To turn a new default 'tomcatN.x.yy/conf/server.xml' into a server_tomcatN.xml.svn
    … …  
    4343  <Listener className="org.apache.catalina.security.SecurityListener" />
    4444  -->
    45   <!--APR library loader. Documentation at /docs/apr.html -->
     45  <!-- APR library loader. Documentation at /docs/apr.html -->
    4646  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
    4747  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
    … …  
    8585         Define a non-SSL/TLS HTTP/1.1 Connector on port @localhost.port.http@
    8686    -->
    87     <!-- GSDL: We comment out the 'standard' connector in favour of the tomcatThreadPool one blow -->
    88     <!-- GSDL: URIEncoding of UTF-8 param also added -->
    89     <!--
     87    <!-- GSDL: We comment out the 'standard' connector in favour of the tomcatThreadPool one below -->
     88    <!-- GSDL: URIEncoding of UTF-8 param also added, and @http.address.restriction@ -->
     89    <!--
     90   
    9091    <Connector @http.address.restriction@
    91                port="@localhost.port.http@"  protocol="HTTP/1.1"
     92               port="@localhost.port.http@" protocol="HTTP/1.1"
    9293               connectionTimeout="20000"
    9394               redirectPort="@https.redirect.port@"
    94                URIEncoding="UTF-8" />
     95               maxParameterCount="1000"
     96               URIEncoding="UTF-8"
     97               />
    9598    -->
    9699    <!-- A "Connector" using the shared thread pool-->
    97     <!-- GSDL: Additional params added after redirectPort -->
     100    <!-- GSDL: We use this Connector by default. Add @http.address.restriction@
     101         Additional params added after redirectPort -->
    98102    <Connector executor="tomcatThreadPool" @http.address.restriction@
    99            port="@localhost.port.http@" protocol="HTTP/1.1"
     103               port="@localhost.port.http@" protocol="HTTP/1.1"
    100104               connectionTimeout="20000"
    101105               redirectPort="@https.redirect.port@"
    102            compression="on"
     106               maxParameterCount="1000"
     107               compression="on"
    103108           compressionMinSize="524288"
    104109           compressableMimeType="text/html,text/xml,text/css,text/xsl,text/javascript"
    105110           noCompressionUserAgents="gozilla, traviata"
    106                URIEncoding="UTF-8" />
     111               URIEncoding="UTF-8"
     112               />
     113   
    107114    <!-- Define an SSL/TLS HTTP/1.1 Connector on port @https.redirect.port@
    108115         This connector uses the NIO implementation. The default
    109116         SSLImplementation will depend on the presence of the APR/native
    110          library and the useOpenSSL attribute of the
    111          AprLifecycleListener.
     117         library and the useOpenSSL attribute of the AprLifecycleListener.
    112118         Either JSSE or OpenSSL style configuration may be used regardless of
    113119         the SSLImplementation selected. JSSE style configuration is used below.
    … …  
    115121    <!-- GSDL: URIEncoding param added, but note the connector elem itself is commented out by default -->
    116122    <!--
     123    <!--
    117124    <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11NioProtocol"
    118                maxThreads="150" SSLEnabled="true" URIEncoding="UTF-8">
     125               maxThreads="150" SSLEnabled="true"
     126               maxParameterCount="1000"
     127               URIEncoding="UTF-8"
     128               >
    119129        <SSLHostConfig>
    120130            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
    … …  
    132142    <!--
    133143    <Connector port="@https.redirect.port@" protocol="org.apache.coyote.http11.Http11AprProtocol"
    134                maxThreads="150" SSLEnabled="true" URIEncoding="UTF-8">
     144               maxThreads="150" SSLEnabled="true"
     145               maxParameterCount="1000"
     146               URIEncoding="UTF-8"
     147               >
    135148        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
    136149        <SSLHostConfig>
    … …  
    150163            clientAuth="false" sslProtocol="TLS"
    151164            keystoreType="@keystore.type@"
     165            maxParameterCount="1000"
    152166            URIEncoding="UTF-8" />
    153167    @https.comment.out.end@
    154168
    155169    <!-- Define an AJP 1.3 Connector on port @tomcat.ajp.port@ -->
     170    <!-- GSDL: URIEncoding param added, but note the connector elem itself is commented out by default -->
    156171    <!--
    157172    <Connector protocol="AJP/1.3"
    158173               address="::1"
    159                port="@tomcat.ajp.port@"       
     174               port="@tomcat.ajp.port@"
    160175               redirectPort="@https.redirect.port@"
    161                URIEncoding="UTF-8" />
     176               maxParameterCount="1000"
     177               URIEncoding="UTF-8"
     178               />
    162179    -->
    163180

  • main/trunk/greenstone3/resources/tomcat/web8.xml.svn

    r34002 r38877  
    1515  See the License for the specific language governing permissions and
    1616  limitations under the License.
    17 -->
     17  -->
    1818<!-- GSDL Notes
    1919  To turn a new default 'tomcatN.x.yy/conf/web.xml' into a webN.xml.svn
    … …  
    2626  Then uncomment the corresponding servlet-mapping element for CGI
    2727-->
    28  
     28
    2929
    3030<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
    … …  
    8686  <!--                                                                      -->
    8787  <!--   sendfileSize        If the connector used supports sendfile, this  -->
    88   <!--                       represents the minimal file size in KB for     -->
     88  <!--                       represents the minimal file size in KiB for     -->
    8989  <!--                       which sendfile will be used. Use a negative    -->
    9090  <!--                       value to always disable sendfile.  [48]        -->
    … …  
    120120  <!--   allowPartialPut     Should the server treat an HTTP PUT request    -->
    121121  <!--                       with a Range header as a partial PUT? Note     -->
    122   <!--                       that RFC 7233 clarified that Range headers are -->
    123   <!--                       only valid for GET requests. [true]            -->
     122  <!--                       that while RFC 7233 clarified that Range       -->
     123  <!--                       headers only valid for GET requests, RFC 9110  -->
     124  <!--                       (which obsoletes RFC 7233) now allows partial  -->
     125  <!--                       puts. [true]                                   -->
    124126
    125127    <servlet>
    … …  
    367369  <!--                        for more details. The default varies by       -->
    368370  <!--                        platform.                                     -->
    369   <!--                        Windows: [[a-zA-Z0-9\Q-_.\\/:\E]+]            -->
     371  <!--                        Windows: [[\w\Q-.\\/:\E]+]            -->
    370372  <!--                        Others:  [.*]                                 -->
    371373  <!--                        Note that internally the CGI Servlet treats   -->
    … …  
    378380  <!--                        request will be rejected. The default matches -->
    379381  <!--                        the allowed values defined by RFC3875.        -->
    380   <!--                        [[a-zA-Z0-9\Q%;/?:@&,$-_.!~*'()\E]+]          -->
     382  <!--                        [[\w\Q%;/?:@&,$-.!~*'()\E]+]          -->
    381383  <!--                                                                      -->
    382384  <!--   enableCmdLineArguments                                             -->
    … …  
    417419  <!--                        terminating the CGI process. [2000]           -->
    418420
    419 
    420     <!-- GSDL: Greenstone makes use of CGI through some Perl scripts, so we need this element in-play  --> 
     421<!-- GSDL: Greenstone makes use of CGI through some Perl scripts, so we need this element in-play  -->
    421422    <servlet>
    422423        <servlet-name>cgi</servlet-name>
    … …  
    427428        </init-param>
    428429
    429         <init-param>
     430                <init-param>
    430431          <param-name>debug</param-name>
    431432          <param-value>0</param-value>
    … …  
    439440          <param-value>@perlpath@perl</param-value>
    440441        </init-param>
    441    
     442
    442443        <load-on-startup>5</load-on-startup>
    443444    </servlet>
    … …  
    565566  <!-- definition towards the bottom of this file.                          -->
    566567  <!-- The contentType init param allows you to apply SSI processing to JSP -->
    567   <!-- pages, javascript, or any other content you wish.  This filter       -->
     568  <!-- pages, JavaScript, or any other content you wish.  This filter       -->
    568569  <!-- supports the following initialization parameters (default values are -->
    569570  <!-- in square brackets):                                                 -->
    … …  
    17901791    </mime-mapping>
    17911792    <mime-mapping>
     1793        <extension>ggs</extension>
     1794        <mime-type>application/vnd.geogebra.slides</mime-type>
     1795    </mime-mapping>
     1796    <mime-mapping>
    17921797        <extension>ggt</extension>
    17931798        <mime-type>application/vnd.geogebra.tool</mime-type>
    … …  
    21432148    <mime-mapping>
    21442149        <extension>js</extension>
    2145         <mime-type>application/javascript</mime-type>
     2150        <mime-type>text/javascript</mime-type>
    21462151    </mime-mapping>
    21472152    <mime-mapping>
    … …  
    24922497        <extension>mjp2</extension>
    24932498        <mime-type>video/mj2</mime-type>
     2499    </mime-mapping>
     2500    <mime-mapping>
     2501        <extension>mjs</extension>
     2502        <mime-type>text/javascript</mime-type>
    24942503    </mime-mapping>
    24952504    <mime-mapping>
    … …  
    29322941    </mime-mapping>
    29332942    <mime-mapping>
     2943        <extension>opus</extension>
     2944        <mime-type>audio/ogg</mime-type>
     2945    </mime-mapping>
     2946    <mime-mapping>
    29342947        <extension>org</extension>
    29352948        <mime-type>application/vnd.lotus-organizer</mime-type>
    … …  
    42754288    </mime-mapping>
    42764289    <mime-mapping>
     4290        <extension>wasm</extension>
     4291        <mime-type>application/wasm</mime-type>
     4292    </mime-mapping>
     4293    <mime-mapping>
    42774294        <extension>wav</extension>
    42784295        <mime-type>audio/x-wav</mime-type>
    … …  
    46774694    <mime-mapping>
    46784695        <extension>z</extension>
    4679         <mime-type>application/x-compress</mime-type>
    4680     </mime-mapping>
    4681     <mime-mapping>
    4682         <extension>Z</extension>
    46834696        <mime-type>application/x-compress</mime-type>
    46844697    </mime-mapping>
Note: See TracChangeset for help on using the changeset viewer.