[java-idp-tomcat-base] 02/02: Update from Tomcat 9.0.12 distribution
Tom Zeller
tzeller at dragonacea.biz
Mon Oct 22 14:26:19 EDT 2018
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch 9.0
in repository java-idp-tomcat-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-tomcat-base.git;a=commit;h=cb30877ef1ddd037c08559d45e9dc930641f63b7
commit cb30877ef1ddd037c08559d45e9dc930641f63b7
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Oct 22 13:25:45 2018 -0500
Update from Tomcat 9.0.12 distribution
---
.../resources/tomcat-base/conf/catalina.policy | 51 ++++----
.../resources/tomcat-base/conf/catalina.properties | 136 ++++++++++++++++-----
src/main/resources/tomcat-base/conf/context.xml | 1 +
src/main/resources/tomcat-base/conf/server.xml | 16 ++-
src/main/resources/tomcat-base/conf/web.xml | 83 ++++++++-----
5 files changed, 199 insertions(+), 88 deletions(-)
diff --git a/src/main/resources/tomcat-base/conf/catalina.policy b/src/main/resources/tomcat-base/conf/catalina.policy
index 8f30898..51c390f 100644
--- a/src/main/resources/tomcat-base/conf/catalina.policy
+++ b/src/main/resources/tomcat-base/conf/catalina.policy
@@ -72,7 +72,7 @@ grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
permission java.io.FilePermission
"${catalina.base}${file.separator}logs", "read, write";
permission java.io.FilePermission
- "${catalina.base}${file.separator}logs${file.separator}*", "read, write";
+ "${catalina.base}${file.separator}logs${file.separator}*", "read, write, delete";
permission java.lang.RuntimePermission "shutdownHooks";
permission java.lang.RuntimePermission "getClassLoader";
@@ -172,33 +172,16 @@ grant {
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.jasper.runtime.*";
- // Precompiled JSPs need access to these system properties.
- permission java.util.PropertyPermission
- "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
- permission java.util.PropertyPermission
- "org.apache.el.parser.COERCE_TO_ZERO", "read";
-
- // The cookie code needs these.
- permission java.util.PropertyPermission
- "org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "read";
- permission java.util.PropertyPermission
- "org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING", "read";
- permission java.util.PropertyPermission
- "org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR", "read";
-
// Applications using WebSocket need to be able to access these packages
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server";
-
- // Applications need to access these packages to use the Servlet 4.0 Preview
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.servlet4preview";
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.servlet4preview.http";
};
// The Manager application needs access to the following packages to support the
-// session display functionality. These settings support the following
-// configurations:
+// session display functionality. It also requires the custom Tomcat
+// DeployXmlPermission to enable the use of META-INF/context.xml
+// These settings support the following configurations:
// - default CATALINA_HOME == CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
@@ -208,6 +191,7 @@ grant codeBase "file:${catalina.base}/webapps/manager/-" {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
+ permission org.apache.catalina.security.DeployXmlPermission "manager";
};
grant codeBase "file:${catalina.home}/webapps/manager/-" {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
@@ -215,8 +199,23 @@ grant codeBase "file:${catalina.home}/webapps/manager/-" {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
+ permission org.apache.catalina.security.DeployXmlPermission "manager";
};
+// The Host Manager application needs the custom Tomcat DeployXmlPermission to
+// enable the use of META-INF/context.xml
+// These settings support the following configurations:
+// - default CATALINA_HOME == CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, per instance Host Manager in CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, shared Host Manager in CATALINA_HOME
+grant codeBase "file:${catalina.base}/webapps/host-manager/-" {
+ permission org.apache.catalina.security.DeployXmlPermission "host-manager";
+};
+grant codeBase "file:${catalina.home}/webapps/host-manager/-" {
+ permission org.apache.catalina.security.DeployXmlPermission "host-manager";
+};
+
+
// You can assign additional permissions to particular web applications by
// adding additional "grant" entries here, based on the code base for that
// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
@@ -249,3 +248,13 @@ grant codeBase "file:${catalina.home}/webapps/manager/-" {
// permission java.net.SocketPermission "*.noaa.gov:80", "connect";
// };
+// To grant permissions for web applications using packed WAR files, use the
+// Tomcat specific WAR url scheme.
+//
+// The permissions granted to the entire web application
+// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" {
+// };
+//
+// The permissions granted to a specific JAR
+// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
+// };
\ No newline at end of file
diff --git a/src/main/resources/tomcat-base/conf/catalina.properties b/src/main/resources/tomcat-base/conf/catalina.properties
index 970725c..407c150 100644
--- a/src/main/resources/tomcat-base/conf/catalina.properties
+++ b/src/main/resources/tomcat-base/conf/catalina.properties
@@ -106,42 +106,105 @@ shared.loader=
# - Common non-Tomcat JARs
# - Test JARs (JUnit, Cobertura and dependencies)
tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
-bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
-annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
-jaspic-api.jar,\
-catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-storeconfig.jar,\
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-jmx-remote.jar,\
+catalina-storeconfig.jar,\
catalina-tribes.jar,\
-jasper.jar,jasper-el.jar,ecj-*.jar,\
-tomcat-api.jar,tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,\
-tomcat-dbcp.jar,tomcat-jni.jar,tomcat-websocket.jar,\
-tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
-tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
+catalina-ws.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-en.jar,\
+tomcat-i18n-es.jar,\
+tomcat-i18n-fr.jar,\
+tomcat-i18n-ja.jar,\
+tomcat-i18n-ru.jar,\
tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
tools.jar,\
-commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
-commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
-commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
-commons-math*.jar,commons-pool*.jar,\
-jstl.jar,taglibs-standard-spec-*.jar,\
-geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
-ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
-jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
-xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
-junit.jar,junit-*.jar,hamcrest-*.jar,easymock-*.jar,cglib-*.jar,\
-objenesis-*.jar,ant-launcher.jar,\
-cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\
-jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\
-xom-*.jar, \
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar,\
+DuoWeb-*.jar,\
UserAgentUtils-*.jar,\
activation-*.jar,\
antlr-*.jar,\
-aopalliance-*.jar,\
bcprov-jdk15on-*.jar,\
c3p0-*.jar,\
commons-codec-*.jar,\
commons-collections-*.jar,\
commons-compiler-*.jar,\
+commons-dbcp2-*.jar,\
commons-lang-*.jar,\
+commons-logging-*.jar,\
+commons-pool2-*.jar,\
cryptacular-*.jar,\
dom4j-*.jar,\
guava-*.jar,\
@@ -152,6 +215,8 @@ hibernate-jpa-2.1-api-*.jar,\
httpclient-*.jar,\
httpclient-cache-*.jar,\
httpcore-*.jar,\
+idp-admin-api-*.jar,\
+idp-admin-impl-*.jar,\
idp-attribute-api-*.jar,\
idp-attribute-filter-api-*.jar,\
idp-attribute-filter-impl-*.jar,\
@@ -174,9 +239,12 @@ idp-saml-impl-*.jar,\
idp-schema-*.jar,\
idp-session-api-*.jar,\
idp-session-impl-*.jar,\
-idp-testbed-*-classes.jar,\
idp-ui-*.jar,\
idwsfconsumer-*.jar,\
+jackson-annotations-*.jar,\
+jackson-core-*.jar,\
+jackson-databind-*.jar,\
+jackson-datatype-joda-*.jar,\
jandex-*.jar,\
janino-*.jar,\
java-support-*.jar,\
@@ -186,16 +254,19 @@ javax.json-api-*.jar,\
jboss-logging-*.jar,\
jboss-logging-annotations-*.jar,\
jboss-transaction-api_1.2_spec-*.jar,\
-jcl-over-slf4j-*.jar,\
jcommander-*.jar,\
joda-time-*.jar,\
+jsonapi-converter-*.jar,\
jsr305-*.jar,\
ldaptive-*.jar,\
-logback-classic-*.jar,\
logback-core-*.jar,\
mail-*.jar,\
mchange-commons-java-*.jar,\
+metrics-core-*.jar,\
+metrics-json-*.jar,\
ognl-*.jar,\
+okhttp-*.jar,\
+okio-*.jar,\
opensaml-core-*.jar,\
opensaml-messaging-api-*.jar,\
opensaml-messaging-impl-*.jar,\
@@ -211,6 +282,7 @@ opensaml-storage-api-*.jar,\
opensaml-storage-impl-*.jar,\
opensaml-xmlsec-api-*.jar,\
opensaml-xmlsec-impl-*.jar,\
+retrofit-*.jar,\
slf4j-api-*.jar,\
spring-aop-*.jar,\
spring-beans-*.jar,\
@@ -229,12 +301,11 @@ spring-web-*.jar,\
spring-webflow-*.jar,\
spring-webmvc-*.jar,\
spymemcached-*.jar,\
-stax-api-*.jar,\
stax2-api-*.jar,\
velocity-*.jar,\
-woodstox-core-asl-*.jar,\
+woodstox-core-*.jar,\
xml-apis-*.jar,\
-xmlsec-*.jar,\
+xmlsec-*.jar
# Default list of JAR files that should be scanned that overrides the default
@@ -243,7 +314,10 @@ xmlsec-*.jar,\
# The list of JARs to scan may be over-ridden at a Context level for individual
# scan types by configuring a JarScanner with a nested JarScanFilter.
tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
-log4j-core*.jar,log4j-taglib*.jar,log4javascript*.jar,slf4j-taglib*.jar
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
# String cache configuration.
tomcat.util.buf.StringCache.byte.enabled=true
diff --git a/src/main/resources/tomcat-base/conf/context.xml b/src/main/resources/tomcat-base/conf/context.xml
index 86c75c0..98312b8 100644
--- a/src/main/resources/tomcat-base/conf/context.xml
+++ b/src/main/resources/tomcat-base/conf/context.xml
@@ -21,6 +21,7 @@
<!-- Default set of monitored resources. If one of these changes, the -->
<!-- web application will be reloaded. -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>
+ <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
<!-- Uncomment this to disable session persistence across Tomcat restarts -->
diff --git a/src/main/resources/tomcat-base/conf/server.xml b/src/main/resources/tomcat-base/conf/server.xml
index c621d95..d9866ef 100644
--- a/src/main/resources/tomcat-base/conf/server.xml
+++ b/src/main/resources/tomcat-base/conf/server.xml
@@ -45,8 +45,12 @@
-->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
- This connector uses the NIO implementation with the JSSE engine. When
- using the JSSE engine, the JSSE configuration attributes must be used.
+ This connector uses the NIO implementation. The default
+ SSLImplementation will depend on the presence of the APR/native
+ library and the useOpenSSL attribute of the
+ AprLifecycleListener.
+ Either JSSE or OpenSSL style configuration may be used regardless of
+ the SSLImplementation selected. JSSE style configuration is used below.
-->
<Connector port="${tomcat.https.port}" protocol="org.apache.coyote.http11.Http11NioProtocol"
@@ -59,9 +63,10 @@
</Connector>
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
- This connector uses the APR/native implementation. When using the
- APR/native implementation or the OpenSSL engine with NIO or NIO2 then
- the OpenSSL configuration attributes must be used.
+ This connector uses the APR/native implementation which always uses
+ OpenSSL for TLS.
+ Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+ configuration is used below.
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
@@ -75,6 +80,7 @@
</SSLHostConfig>
</Connector>
-->
+
<Connector port="${tomcat.backchannel.port}" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150"
maxPostSize="100000"
diff --git a/src/main/resources/tomcat-base/conf/web.xml b/src/main/resources/tomcat-base/conf/web.xml
index 793a8a8..b3ebce2 100644
--- a/src/main/resources/tomcat-base/conf/web.xml
+++ b/src/main/resources/tomcat-base/conf/web.xml
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
@@ -48,6 +48,11 @@
<!-- fileEncoding Encoding to be used to read static resources -->
<!-- [platform default] -->
<!-- -->
+ <!-- useBomIfPresent If a static file contains a byte order mark -->
+ <!-- (BOM), should this be used to determine the -->
+ <!-- file encoding in preference to fileEncoding. -->
+ <!-- [true] -->
+ <!-- -->
<!-- input Input buffer size (in bytes) when reading -->
<!-- resources to be served. [2048] -->
<!-- -->
@@ -138,9 +143,9 @@
<!-- pages. See the jasper documentation for more -->
<!-- information. -->
<!-- -->
- <!-- compilerSourceVM Compiler source VM. [1.7] -->
+ <!-- compilerSourceVM Compiler source VM. [1.8] -->
<!-- -->
- <!-- compilerTargetVM Compiler target VM. [1.7] -->
+ <!-- compilerTargetVM Compiler target VM. [1.8] -->
<!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
@@ -163,6 +168,8 @@
<!-- engineOptionsClass Allows specifying the Options class used to -->
<!-- configure Jasper. If not present, the default -->
<!-- EmbeddedServletOptions will be used. -->
+ <!-- This option is ignored when running under a -->
+ <!-- SecurityManager. -->
<!-- -->
<!-- errorOnUseBeanInvalidClassAttribute -->
<!-- Should Jasper issue an error when the value of -->
@@ -224,12 +231,20 @@
<!-- scratchdir What scratch directory should we use when -->
<!-- compiling JSP pages? [default work directory -->
<!-- for the current web application] -->
+ <!-- This option is ignored when running under a -->
+ <!-- SecurityManager. -->
<!-- -->
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
<!-- -->
- <!-- trimSpaces Should white spaces in template text between -->
- <!-- actions or directives be trimmed? [false] -->
+ <!-- trimSpaces Should template text that consists entirely of -->
+ <!-- whitespace be removed from the output (true), -->
+ <!-- replaced with a single space (single) or left -->
+ <!-- unchanged (false)? Note that if a JSP page or -->
+ <!-- tag file specifies a trimDirectiveWhitespaces -->
+ <!-- value of true, that will take precedence over -->
+ <!-- this configuration setting for that page/tag. -->
+ <!-- [false] -->
<!-- -->
<!-- xpoweredBy Determines whether X-Powered-By response -->
<!-- header is added by generated servlet. [false] -->
@@ -331,26 +346,32 @@
<!-- If not set, then webAppRootDir is used. -->
<!-- Recommended value: WEB-INF/cgi -->
<!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. Useful values range from 0 -->
- <!-- to 5 where 0 means no logging and 5 means -->
- <!-- maximum logging. Values of 10 or more mean -->
- <!-- maximum logging plus debug info added to the -->
- <!-- HTTP response. If an error occurs and debug -->
- <!-- is 10 or more the standard error page -->
- <!-- mechanism will be disabled and a response -->
- <!-- body with debug information will be produced. -->
- <!-- Note that any value of 10 or more has the -->
- <!-- same effect as a value of 10. If set to 10 or -->
- <!-- more the standard error page mechanism will -->
- <!-- be disabled and a debug page shown instead. -->
- <!-- The debug page is not considered secure and -->
- <!-- should not be enabled for production systems. -->
- <!-- [0] -->
+ <!-- enableCmdLineArguments -->
+ <!-- Are command line parameters generated from -->
+ <!-- the query string as per section 4.4 of 3875 -->
+ <!-- RFC? [false] -->
<!-- -->
<!-- executable Name of the executable used to run the -->
<!-- script. [perl] -->
<!-- -->
+ <!-- envHttpHeaders A regular expression used to select the HTTP -->
+ <!-- headers passed to the CGI process as -->
+ <!-- environment variables. Note that headers are -->
+ <!-- converted to upper case before matching and -->
+ <!-- that the entire header name must match the -->
+ <!-- pattern. -->
+ <!-- [ACCEPT[-0-9A-Z]*|CACHE-CONTROL|COOKIE|HOST| -->
+ <!-- IF-[-0-9A-Z]*|REFERER|USER-AGENT] -->
+ <!-- -->
+ <!-- environment-variable- An environment to be set for the execution -->
+ <!-- environment of the CGI script. The name of -->
+ <!-- variable is taken from the parameter name. -->
+ <!-- To configure an environment variable named -->
+ <!-- FOO, configure a parameter named -->
+ <!-- environment-variable-FOO. The parameter value -->
+ <!-- is used as the environment variable value. -->
+ <!-- The default is no environment variables. -->
+ <!-- -->
<!-- parameterEncoding Name of parameter encoding to be used with -->
<!-- CGI servlet. -->
<!-- [System.getProperty("file.encoding","UTF-8")] -->
@@ -367,14 +388,10 @@
<servlet-name>cgi</servlet-name>
<servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
<init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
<param-name>cgiPathPrefix</param-name>
<param-value>WEB-INF/cgi</param-value>
</init-param>
- <load-on-startup>5</load-on-startup>
+ <load-on-startup>5</load-on-startup>
</servlet>
-->
@@ -2883,7 +2900,7 @@
</mime-mapping>
<mime-mapping>
<extension>otf</extension>
- <mime-type>application/x-font-otf</mime-type>
+ <mime-type>font/otf</mime-type>
</mime-mapping>
<mime-mapping>
<!-- OpenDocument Drawing Template -->
@@ -3922,11 +3939,11 @@
</mime-mapping>
<mime-mapping>
<extension>ttc</extension>
- <mime-type>application/x-font-ttf</mime-type>
+ <mime-type>font/collection</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ttf</extension>
- <mime-type>application/x-font-ttf</mime-type>
+ <mime-type>font/ttf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ttl</extension>
@@ -4315,7 +4332,11 @@
</mime-mapping>
<mime-mapping>
<extension>woff</extension>
- <mime-type>application/x-font-woff</mime-type>
+ <mime-type>font/woff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>woff2</extension>
+ <mime-type>font/woff2</mime-type>
</mime-mapping>
<mime-mapping>
<extension>wpd</extension>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list