From 455ad71863827e6216910dd327c1c3738d660a11 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Thu, 12 Sep 2019 16:58:21 +0200
Subject: [PATCH] Polish contribution

See gh-23629
---
 .../org/springframework/mail/javamail/mime.types          | 8 +++++---
 src/nohttp/whitelist.lines                                | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

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 92b924aca6b..b03625f6331 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 1076c6d3f9d..bf8c2a29431 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.*