diff --git a/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types b/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types index 92b924aca6..b03625f633 100644 --- a/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types +++ b/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types @@ -1,5 +1,5 @@ ################################################################################ -# Copyright 2002-2018 the original author or authors. +# Copyright 2002-2019 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,9 +17,11 @@ ################################################################################ # # Defaults for the Java Activation Framework (revised). +# # Modified extensions registered in this file: # text/plain java c c++ cpp pl cc h # image/png png +# image/svg+xml svg # ################################################################################ @@ -48,7 +50,7 @@ video/x-msvideo avi ################################################################################ # # Additional file types adapted from -# https://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html +# http://sites.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html # kindly re-licensed to Apache Software License 2.0 by Ian Graham. # ################################################################################ @@ -68,7 +70,7 @@ image/x-xpixmap xpm # Portable Network Graphics image/png png # Scalable Vector Graphics -image/svg+xml svg +image/svg+xml svg # Image Exchange Format (RFC 1314) image/ief ief # RGB diff --git a/src/nohttp/whitelist.lines b/src/nohttp/whitelist.lines index 1076c6d3f9..bf8c2a2943 100644 --- a/src/nohttp/whitelist.lines +++ b/src/nohttp/whitelist.lines @@ -16,6 +16,7 @@ ^http://mx4j.sourceforge.net.* ^http://objenesis.org.* ^http://reactivex.io.* +^http://sites.utoronto.ca.* ^http://www.beanshell.org.* ^http://www.doclet.com.* ^http://www.jensgulden.de.*