From 9601d4bb5b40f3abba3d81b2347c7e43d07be64c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 3 Apr 2018 12:23:09 +0200 Subject: [PATCH] Revised mime.types file with cpp extension and updated modification docs Issue: SPR-16678 --- .../org/springframework/mail/javamail/mime.types | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 7d625b684d8..1eabbf5d2f4 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-2010 the original author or authors. +# Copyright 2002-2018 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. @@ -16,14 +16,15 @@ ################################################################################ # -# Defaults for the Java Activation Framework -# Additional extensions registered in this file: -# text/plain java c c++ pl cc h +# 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 # ################################################################################ text/html html htm HTML HTM -text/plain txt text TXT TEXT java c c++ pl cc h +text/plain txt text TXT TEXT java c c++ cpp pl cc h image/gif gif GIF image/ief ief image/jpeg jpeg jpg jpe JPG