Importing latest IANA updates.

4 files changed, 37 insertions, 6 deletions

diff --git a/History.rdoc b/History.rdoc
index 85b19486d3..c15d2eb1d0 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -14,6 +14,18 @@
     https://github.com/halostatue/mime-types/issues/32
   * application/x-www-form-urlencoded. Fixes a request by alexkwolfe.
     https://github.com/halostatue/mime-types/issues/39
+  * Various new MIME types from IANA:
+    * application/mbms-schedule\+xml from 3GPP and Turcotte.
+    * application/provenance\+xml from W3C and Herman.
+    * application/session-info from 3GPP and Firmin.
+    * application/urc-grpsheet\+xml, application/urc-targetdesc\+xml,
+      application/uisocketdesc\+xml from Zimmermann.
+    * application/api\+json from Klabnik.
+    * application/vnd.etsi.pstn\+xml from Han and Belling.
+    * application/vnd.fujixerox.docuworks.container from Tashiro.
+    * application/vnd.windows.devicepairing from Dandawate.
+* Updated MIME Types:
+  * RFC 6960 was adopted (application/ocsp-request and application/ocsp-response).
 
 == 1.23 / 2013-04-20
 
diff --git a/lib/mime/types/application b/lib/mime/types/application
index 21f80be80f..631ce5e95e 100644
--- a/lib/mime/types/application
+++ b/lib/mime/types/application
@@ -105,6 +105,7 @@ application/mbms-protection-description+xml 'IANA,[3GPP]
 application/mbms-reception-report+xml 'IANA,[3GPP]
 application/mbms-register+xml 'IANA,[3GPP]
 application/mbms-register-response+xml 'IANA,[3GPP]
+application/mbms-schedule+xml 'IANA,[3GPP],[Turcotte]
 application/mbms-user-service-description+xml 'IANA,[3GPP]
 application/mbox 'IANA,RFC4155
 application/media-policy-dataset+xml 'IANA,RFC6796
@@ -135,8 +136,8 @@ application/news-groupinfo 'IANA,RFC5537
 application/news-transmission 'IANA,RFC5537
 application/nlsml+xml 'IANA,RFC6787
 application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
-application/ocsp-response 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
+application/ocsp-request 'IANA,RFC6960
+application/ocsp-response 'IANA,RFC6960
 application/octet-stream @bin,dms,lha,lzh,exe,class,ani,pgp,so,dll,dylib :base64 'IANA,RFC2045,RFC2046
 application/oda @oda 'IANA,RFC2045,RFC2046
 application/oebps-package+xml 'IANA,RFC4839
@@ -163,6 +164,7 @@ application/pkixcmp @pki 'IANA,RFC2510
 application/pls+xml 'IANA,RFC4267
 application/poc-settings+xml 'IANA,RFC4354
 application/postscript @ai,eps,ps :8bit 'IANA,RFC2045,RFC2046
+application/provenance+xml 'IANA,[3GPP],[Firmin]
 application/prs.alvestrand.titrax-sheet 'IANA,[Alvestrand]
 application/prs.cww @cw,cww 'IANA,[Rungchavalnont]
 application/prs.nprend @rnd,rct 'IANA,[Doggett]
@@ -240,6 +242,7 @@ application/timestamp-reply 'IANA,RFC3161
 application/timestamped-data 'IANA,RFC5955
 application/tve-trigger 'IANA,[Welsh]
 application/ulpfec 'IANA,RFC5109
+application/urc-grpsheet+xml 'IANA,[Zimmermann]
 application/urc-ressheet+xml 'IANA,[Zimmermann]
 application/vcard+xml 'IANA,RFC6351
 application/vemmi 'IANA,RFC2122
@@ -271,6 +274,7 @@ application/vnd.amiga.ami @ami 'IANA,[Blumberg]
 application/vnd.amundsen.maze+xml 'IANA,[Amundsen]
 application/vnd.anser-web-certificate-issue-initiation 'IANA,[Mori]
 application/vnd.antix.game-component 'IANA,[Shelton]
+application/vnd.api+json 'IANA,[Klabnik]
 application/vnd.apple.installer+xml 'IANA,[Bierman]
 application/vnd.apple.mpegurl 'IANA,[Singer],[Pantos]
 application/vnd.aristanetworks.swi 'IANA,[Fenner]
@@ -390,6 +394,7 @@ application/vnd.etsi.iptvueprofile+xml 'IANA,[Hu]
 application/vnd.etsi.mcid+xml 'IANA,[Hu]
 application/vnd.etsi.mheg5 'IANA,[Ortega],[Medland]
 application/vnd.etsi.overload-control-policy-dataset+xml 'IANA,[Ortega]
+application/vnd.etsi.pstn+xml 'IANA,[Han],[Belling]
 application/vnd.etsi.sci+xml 'IANA,[Hu]
 application/vnd.etsi.simservs+xml 'IANA,[Hu]
 application/vnd.etsi.tsl+xml 'IANA,[Hu]
@@ -420,6 +425,7 @@ application/vnd.fujixerox.ART4 'IANA,[Tanabe]
 application/vnd.fujixerox.ddd 'IANA,[Onda]
 application/vnd.fujixerox.docuworks 'IANA,[Taguchi]
 application/vnd.fujixerox.docuworks.binder 'IANA,[Matsumoto]
+application/vnd.fujixerox.docuworks.container 'IANA,[Tashiro]
 application/vnd.fujixerox.HBPL 'IANA,[Tanabe]
 application/vnd.fut-misnet 'IANA,[Pruulmann]
 application/vnd.fuzzysheet 'IANA,[Birtwistle]
@@ -933,6 +939,7 @@ application/vnd.wap.wmlc @wmlc 'IANA,[Stark]
 application/vnd.wap.wmlscriptc @wmlsc 'IANA,[Stark]
 application/vnd.webturbo @wtb 'IANA,[Rehem]
 application/vnd.wfa.wsc 'IANA,[Wi-Fi Alliance]
+application/vnd.windows.devicepairing 'IANA,[Dandawate]
 application/vnd.wmc 'IANA,[Kjørnes=Kjornes]
 application/vnd.wmf.bootstrap 'IANA,[Nguyenphu],[Iyer]
 application/vnd.wolfram.mathematica 'IANA,[Wolfram]
@@ -978,6 +985,7 @@ application/wita 'IANA,[Campbell]
 application/wordperfect5.1 @wp5,wp 'IANA,[Lindner]
 application/wsdl+xml 'IANA,[W3C]
 application/wspolicy+xml 'IANA,[W3C]
+application/x-www-form-urlencoded :7bit '[W3C],{HTML5=http://www.w3.org/TR/html5/iana.html#application/x-www-form-urlencoded}
 application/x400-bp 'IANA,RFC1494
 application/xcap-att+xml 'IANA,RFC4825
 application/xcap-caps+xml 'IANA,RFC4825
@@ -1000,4 +1008,3 @@ application/yang 'IANA,RFC6020
 application/yin+xml 'IANA,RFC6020
 application/zip @zip :base64 'IANA,[Lindner]
 application/zlib 'IANA,RFC6713
-application/x-www-form-urlencoded :7bit '[W3C],{HTML5=http://www.w3.org/TR/html5/iana.html#application/x-www-form-urlencoded}
diff --git a/type-lists/application.txt b/type-lists/application.txt
index 15af1b8c58..650814d454 100644
--- a/type-lists/application.txt
+++ b/type-lists/application.txt
@@ -106,6 +106,7 @@ application/mbms-protection-description+xml 'IANA,[3GPP]
 application/mbms-reception-report+xml 'IANA,[3GPP]
 application/mbms-register-response+xml 'IANA,[3GPP]
 application/mbms-register+xml 'IANA,[3GPP]
+application/mbms-schedule+xml 'IANA,[3GPP],[Turcotte]
 application/mbms-user-service-description+xml 'IANA,[3GPP]
 application/mbox 'IANA,RFC4155
 application/media_control+xml 'IANA,RFC5168
@@ -136,8 +137,8 @@ application/news-groupinfo 'IANA,RFC5537
 application/news-transmission 'IANA,RFC5537
 application/nlsml+xml 'IANA,RFC6787
 application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
-application/ocsp-response 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
+application/ocsp-request 'IANA,RFC6960
+application/ocsp-response 'IANA,RFC6960
 application/octet-stream 'IANA,RFC2045,RFC2046
 application/oda 'IANA,RFC2045,RFC2046
 application/oebps-package+xml 'IANA,RFC4839
@@ -164,6 +165,7 @@ application/pkix-pkipath 'IANA,RFC6066
 application/pls+xml 'IANA,RFC4267
 application/poc-settings+xml 'IANA,RFC4354
 application/postscript 'IANA,RFC2045,RFC2046
+application/provenance+xml 'IANA,[W3C],[Herman]
 application/prs.alvestrand.titrax-sheet 'IANA,[Alvestrand]
 application/prs.cww 'IANA,[Rungchavalnont]
 application/prs.nprend 'IANA,[Doggett]
@@ -199,6 +201,7 @@ application/scvp-vp-response 'IANA,RFC5055
 application/sdp 'IANA,RFC4566
 application/sep-exi 'IANA,[Robby_Simpson=RoSimpson],[ZigBee_Alliance=ZigBee]
 application/sep+xml 'IANA,[Robby_Simpson=RoSimpson],[ZigBee_Alliance=ZigBee]
+application/session-info 'IANA,[3GPP],[Firmin]
 application/set-payment 'IANA,[Korver]
 application/set-payment-initiation 'IANA,[Korver]
 application/set-registration 'IANA,[Korver]
@@ -242,7 +245,10 @@ application/timestamp-reply 'IANA,RFC3161
 application/timestamped-data 'IANA,RFC5955
 application/tve-trigger 'IANA,[Welsh]
 application/ulpfec 'IANA,RFC5109
+application/urc-grpsheet+xml 'IANA,[Zimmermann]
 application/urc-ressheet+xml 'IANA,[Zimmermann]
+application/urc-targetdesc+xml 'IANA,[Zimmermann]
+application/urc-uisocketdesc+xml 'IANA,[Zimmermann]
 application/vcard+xml 'IANA,RFC6351
 application/vemmi 'IANA,RFC2122
 application/vnd.3gpp.bsf+xml 'IANA,[Meredith]
@@ -273,6 +279,7 @@ application/vnd.amiga.ami 'IANA,[Blumberg]
 application/vnd.amundsen.maze+xml 'IANA,[Amundsen]
 application/vnd.anser-web-certificate-issue-initiation 'IANA,[Mori]
 application/vnd.antix.game-component 'IANA,[Shelton]
+application/vnd.api+json 'IANA,[Klabnik]
 application/vnd.apple.mpegurl 'IANA,[Singer],[Pantos]
 application/vnd.apple.installer+xml 'IANA,[Bierman]
 application/vnd.arastra.swi (OBSOLETE) 'IANA,[Fenner]
@@ -393,6 +400,7 @@ application/vnd.etsi.iptvueprofile+xml 'IANA,[Hu]
 application/vnd.etsi.mcid+xml 'IANA,[Hu]
 application/vnd.etsi.mheg5 'IANA,[Ortega],[Medland]
 application/vnd.etsi.overload-control-policy-dataset+xml 'IANA,[Ortega]
+application/vnd.etsi.pstn+xml 'IANA,[Han],[Belling]
 application/vnd.etsi.sci+xml 'IANA,[Hu]
 application/vnd.etsi.simservs+xml 'IANA,[Hu]
 application/vnd.etsi.tsl+xml 'IANA,[Hu]
@@ -423,6 +431,7 @@ application/vnd.fujixerox.ART-EX 'IANA,[Tanabe]
 application/vnd.fujixerox.ddd 'IANA,[Onda]
 application/vnd.fujixerox.docuworks 'IANA,[Taguchi]
 application/vnd.fujixerox.docuworks.binder 'IANA,[Matsumoto]
+application/vnd.fujixerox.docuworks.container 'IANA,[Tashiro]
 application/vnd.fujixerox.HBPL 'IANA,[Tanabe]
 application/vnd.fut-misnet 'IANA,[Pruulmann]
 application/vnd.fuzzysheet 'IANA,[Birtwistle]
@@ -938,6 +947,7 @@ application/vnd.wap.wmlc 'IANA,[Stark]
 application/vnd.wap.wmlscriptc 'IANA,[Stark]
 application/vnd.webturbo 'IANA,[Rehem]
 application/vnd.wfa.wsc 'IANA,[Wi-Fi Alliance]
+application/vnd.windows.devicepairing 'IANA,[Dandawate]
 application/vnd.wmc 'IANA,[Kjørnes=Kjornes]
 application/vnd.wmf.bootstrap 'IANA,[Nguyenphu],[Iyer]
 application/vnd.wolfram.mathematica 'IANA,[Wolfram]
diff --git a/type-lists/video.txt b/type-lists/video.txt
index 45dd2f9c19..73030882eb 100644
--- a/type-lists/video.txt
+++ b/type-lists/video.txt
@@ -65,9 +65,11 @@ video/vnd.ms-playready.media.pyv 'IANA,[DiAcetis]
 video/vnd.nokia.interleaved-multimedia 'IANA,[Kangaslampi]
 video/vnd.nokia.videovoip 'IANA,[Nokia]
 video/vnd.objectvideo 'IANA,[Clark]
+video/vnd.radgamettools.bink 'IANA,[Andersson]
+video/vnd.radgamettools.smacker 'IANA,[Andersson]
 video/vnd.sealed.mpeg1 'IANA,[Petersen]
 video/vnd.sealed.mpeg4 'IANA,[Petersen]
 video/vnd.sealed.swf 'IANA,[Petersen]
 video/vnd.sealedmedia.softseal.mov 'IANA,[Petersen]
 video/vnd.uvvu.mp4 'IANA,[Dolan]
-video/vnd.vivo 'IANA,[Wolfe]
\ No newline at end of file
+video/vnd.vivo 'IANA,[Wolfe]