diff -Nru ruby-mime-types-1.17.2/.hoerc ruby-mime-types-1.25/.hoerc
--- ruby-mime-types-1.17.2/.hoerc 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/.hoerc 2013-09-14 14:09:18.000000000 +0000
@@ -1,12 +1,2 @@
----
-publish_on_announce: false
-exclude: !ruby/regexp /\.(?:svn|git)|(?:\.(?:swp|hoerc|DS_Store)|~|email.txt)$|(?:coverage|type-lists)\//
-signing_key_file: ~/.gem/gem-private_key.pem
-signing_cert_file: ~/.gem/gem-public_cert.pem
-blogs:
-- user: user
- url: url
- extra_headers:
- mt_convert_breaks: markdown
- blog_id: blog_id
- password: password
+---
+exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile\.lock|type-lists\/|\.gemspec/
diff -Nru ruby-mime-types-1.17.2/.travis.yml ruby-mime-types-1.25/.travis.yml
--- ruby-mime-types-1.17.2/.travis.yml 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/.travis.yml 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,27 @@
+---
+after_script:
+- rake travis:after -t
+before_script:
+- gem install hoe-travis --no-rdoc --no-ri
+- rake travis:before -t
+language: ruby
+notifications:
+ email: true
+rvm:
+ - 2.0.0
+ - 1.9.3
+ - 1.9.2
+ - 1.8.7
+ - jruby-19mode
+ - jruby-18mode
+ - rbx-19mode
+ - rbx-18mode
+ - ree
+# - ruby-head
+# - jruby-head
+matrix:
+ allow_failures:
+ - rvm:
+ - ruby-head
+ - jruby-head
+script: rake travis
diff -Nru ruby-mime-types-1.17.2/Contributing.rdoc ruby-mime-types-1.25/Contributing.rdoc
--- ruby-mime-types-1.17.2/Contributing.rdoc 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/Contributing.rdoc 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,69 @@
+== Contributing
+
+I value any contribution to MIME::Types you can provide: a bug report, a feature
+request, or code contributions.
+
+Code contributions to MIME::Types are especially welcomeencouraged.
+Because MIME::Types is a complex codebase, there are a few guidelines:
+
+* Changes (aside from new MIME types) will not be accepted
+ without tests. The test suite is written with MiniTest.
+* Match my coding style.
+* Use a thoughtfully-named topic branch that contains your change. Rebase your
+ commits into logical chunks as necessary.
+* Use {quality commit messages}[http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html].
+* Do not change the version number; when your patch is accepted and a release
+ is made, the version will be updated at that point.
+* Submit a GitHub pull request with your changes.
+* New features require new documentation.
+
+=== Test Dependencies
+
+To run the test suite, you will need to install the development dependencies
+for MIME::Types. If you have Bundler, you can accomplish this easily:
+
+ $ bundle install
+
+MIME::Types uses Ryan Davis’s excellent {Hoe}[https://github.com/seattlerb/hoe]
+to manage the release process, and it adds a number of rake tasks. You will
+mostly be interested in:
+
+ $ rake
+
+which runs the tests the same way that:
+
+ $ rake test
+ $ rake travis
+
+will do.
+
+=== Workflow
+
+Here's the most direct way to get your work merged into the project:
+
+* Fork the project.
+* Clone down your fork (+git clone git://github.com//mime-types.git+).
+* Create a topic branch to contain your change (+git checkout -b my\_awesome\_feature+).
+* Hack away, add tests. Not necessarily in that order.
+* Make sure everything still passes by running `rake`.
+* If necessary, rebase your commits into logical chunks, without errors.
+* Push the branch up (+git push origin my\_awesome\_feature+).
+* Create a pull request against halostatue/mime-types and describe what your
+ change does and the why you think it should be merged.
+
+=== Contributors
+
+* Austin Ziegler created MIME::Types.
+
+Thanks to everyone else who has contributed to MIME::Types:
+
+* Andre Pankratz
+* Mauricio Linhares
+* Richard Hirner
+* Todd Carrico
+* Garret Alfert
+* Hans de Graaff
+* Henrik Hodne
+* Martin d'Allens
+* cgat
+* Greg Brockman
diff -Nru ruby-mime-types-1.17.2/Gemfile ruby-mime-types-1.25/Gemfile
--- ruby-mime-types-1.17.2/Gemfile 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/Gemfile 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,20 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source "https://rubygems.org/"
+
+
+gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "minitest", "~>5.0", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
+gem "hoe-bundler", "~>1.2", :group => [:development, :test]
+gem "hoe-doofus", "~>1.0", :group => [:development, :test]
+gem "hoe-gemspec2", "~>1.1", :group => [:development, :test]
+gem "hoe-git", "~>1.5", :group => [:development, :test]
+gem "hoe-rubygems", "~>1.0", :group => [:development, :test]
+gem "hoe-travis", "~>1.2", :group => [:development, :test]
+gem "rake", "~>10.0", :group => [:development, :test]
+gem "hoe", "~>3.7", :group => [:development, :test]
+
+# vim: syntax=ruby
diff -Nru ruby-mime-types-1.17.2/History.rdoc ruby-mime-types-1.25/History.rdoc
--- ruby-mime-types-1.17.2/History.rdoc 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/History.rdoc 2013-09-14 14:09:18.000000000 +0000
@@ -1,25 +1,172 @@
-== MIME::Types 1.17.2 / 2011-10-25
+== 1.25 / 2013-08-30
+
+* New Features:
+ * Adding lazy loading and caching functionality to the default data based on
+ work done by Greg Brockman (gdb).
+* Bugs:
+ * Force the default internal application encoding to be used when reading the
+ MIME types database. Based on a change by briangamble, found in the rapid7
+ fork.
+* New extensions:
+ * mjpeg (video/x-motion-jpeg) based on a change by punkrats, found in the
+ vidibus fork.
+* Modernized MiniTest configuration.
+
+== 1.24 / 2013-08-14
+
+* Code Climate:
+ * Working on improving the quality of the mime-types codebase through the use
+ of Code Climate. https://codeclimate.com/github/halostatue/mime-types
+ * Simplified MIME::Type.from_array to make more assumptions about assignment.
+* Documentation:
+ * LeoYoung pointed out that the README.rdoc contained
+ examples that could never possibly work because MIME::Types#[] returns (for
+ all the versions I have handy) an array, not a single type. I have updated
+ README.rdoc to reflect this.
+* Removed Nokogiri as a declared development dependency. It is still required
+ if you're going to use the IANA parser functionality, but it is not necessary
+ for most development purposes. This has been removed to ensure that Travis CI
+ passes on Ruby 1.8.7.
+* New MIME Types:
+ * 7zip (application/x-7z-compressed). Fixes a request by kodram.
+ 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.
+ * video/vnd.radgamettools.bink and video/vnd.radgamettools.smacker from
+ Andersson.
+* Updated MIME Types:
+ * RFC 6960 was adopted (application/ocsp-request and application/ocsp-response).
+
+== 1.23 / 2013-04-20
+
+* New Feature:
+ * Arnaud Meuret (ameuret) suggested that it could be useful if the MIME type
+ collection was enumerable, so he implemented it in #30. Thanks for the
+ contribution! https://github.com/halostatue/mime-types/pull/30
+* Updated MIME Types:
+ * RFC6910 was adopted (application/call-completion).
+ * RFC6902 was adopted (application/json-patch\+json).
+ * RFC6917 was adopted (application/mrb-consumer\+xml,
+ application/mrb-publish\+xml).
+ * RFC6922 was adopted (application/sql).
+ * RFC2560 is being
+ {updated}[http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis].
+* Administrivia:
+ * The gemspec now includes information about the licenses under which the
+ mime-types gem is available.
+ * Using hoe-gemspec2 instead of hoe-gemspec.
+
+== 1.22 / 2013-03-30
+
+* New MIME Types:
+ * Added support for 3FR (Hasselblad raw images) files. MIME-Type was obtained
+ by looking at exif data with exiftool. Thanks to cgat for these changes.
+ https://github.com/halostatue/mime-types/pull/27
+* Updated MIME Types:
+ * Pulled the latest updates from the IANA MIME-Type registry.
+* Added support for Ruby 2.0 with Travis CI.
+
+== 1.21 / 2013-02-09
+
+* New MIME Types:
+ * Various new or updated MIME types by Garret Alfert:
+ application/vnd.ms-fontobject, .eot; application/x-chrome-extension, .crx;
+ application/x-web-app-manifest\+json, .webapp; application/x-xpinstall,
+ .xpi; image/svg\+xml, .svg, .svgz; image/webp, .webp; text/cache-manifest,
+ .appcache, .manifest. https://github.com/halostatue/mime-types/pull/24
+* Fixed some Manifest.txt related madness on Travis.
+
+== 1.20.1 / 2013-01-26
+
+* New MIME Types:
+ * Apple iWork document types added by Hans de Graaff
+ (application/x-iwork-keynote-sffkey, .key;
+ application/x-iwork-pages-sffpages, .pages;
+ application/x-iwork-numbers-sffnumbers, .numbers).
+ https://github.com/halostatue/mime-types/issue/20
+ * epub, ibooks, mobi, and DMG content types by Mauricio
+ Linhares (mac:application/x-apple-diskimage, .dmg; application/epub\+zip,
+ .epub; application/x-ibooks\+zip, .ibooks; application/x-mobipocket-ebook,
+ .mobi). https://github.com/halostatue/mime-types/issue/22
+ * rss content type by Garret Alfert (application/rss\+xml, .rss).
+ https://github.com/halostatue/mime-types/issue/23
+ * Added or updated MIME types from the latest IANA list.
+* Fixed MIME Types:
+ * Excel macro-enabled spreadsheets had an incorrect extension. Thanks to
+ Rafael Belvederese for reporting this issue.
+ https://github.com/halostatue/mime-types/issue/21
+* Enabled for use with travis.
+* Enabled gem signing.
+* Fixed an error related to MIME type downloads.
+* This was previously published as 1.20, but I had forgotten some attributions.
+
+== 1.19 / 2012-06-20
+* New MIME Types:
+ * XCF Gnome Images (image/x-xcf, image/x-compressed-xcf; .xcf). https://github.com/halostatue/mime-types/issue/17
+ * Types reported in https://github.com/halostatue/mime-types/issues/12:
+ * DV (video/x-dv; .dv)
+ * IVF (video/x-ivf; .ivf)
+ * Matroska (video/x-matroska; .mkv)
+ * Motion JPEG (video/x-motion-jpeg; .mjpg)
+ * RealMedia (official; application/vnd.rn-realmedia; .rm)
+* New extensions:
+ * dcm (application/dicom); https://github.com/halostatue/mime-types/issue/16.
+ * Types reported in https://github.com/halostatue/mime-types/issues/12:
+ * 3g2, 3gpp2 (video/3gpp2)
+ * mpeg (video/mpeg)
+ * mxf (application/mxf)
+ * ts (video/MP2T)
+ * ogg (video/ogg)
+* Fixed MIME Types:
+ * Adobe AIR application installer packages was missing a hyphen. https://github.com/halostatue/mime-types/issue/13
+ * Types reported in https://github.com/halostatue/mime-types/issues/12:
+ * audio/x-pn-realaudio extension is .ra, not .rm.
+* Resolved https://github.com/halostatue/mime-types/issues/8. Apparently some people run the tests on Linux. Imagine that.
+
+== 1.18 / 2012-03-20
+* New MIME Types:
+ * Types reported in https://github.com/halostatue/mime-types/issues/6:
+ * CoffeeScript (text/x-coffeescript; .coffee; 8bit).
+ * AIR (application/vnd.adobe.air-applicationinstaller-package+zip, .air; base64).
+ * WOFF (application/font-woff; .woff; base64).
+ * TrueType (application/x-font-truetype; .ttf; base64).
+ * OpenType (application/x-font-opentype; .otf; base64).
+ * WebM (audio/webm, video/webm; .webm). https://github.com/halostatue/mime-types/issues/11.
+* New extensions:
+ * f4v/f4p (video/mp4, used by Adobe); f4a/fb4 (audio/mp4, used by Adobe).
+* Bug Fixes:
+ * It was pointed out that Licence.txt was incorrectly named. Fixed by renaming to Licence.rdoc (from Issue/Pull Request #8, https://github.com/halostatue/mime-types/issues/8).
+ * It was pointed out that a plan to have the test output generated automatically never went through. https://github.com/halostatue/mime-types/issues/10
+
+== 1.17.2 / 2011-10-25
* Bug Fixes:
* Fixed an issue with Ruby 1.9 and file encoding.
-== MIME::Types 1.17.1 / 2011-10-23
+== 1.17.1 / 2011-10-23
* Minor Enhancements:
* Implemented modern 'hoe' semantics.
* Switched to minitest instead of test/unit.
* Converted documentation from .txt to .rdoc.
- * Removed setup.rb. (Issue #3:
- https://github.com/halostatue/mime-types/issues/3).
- * Should no longer complain about missing RubyGems keys (Issue #2:
- https://github.com/halostatue/mime-types/issues/2).
+ * Removed setup.rb. https://github.com/halostatue/mime-types/issues/3
+ * Should no longer complain about missing RubyGems keys https://github.com/halostatue/mime-types/issues/2
* Added .mp4 and .mpg4 as recognized extensions for
- {application,audio,video}/mp4 per RFC4337. (Issue #1:
- https://github.com/halostatue/mime-types/issues/1).
+ {application,audio,video}/mp4 per RFC4337. https://github.com/halostatue/mime-types/issues/1
* Added audio/x-aac and .aac per RubyForge issue #28054
(http://rubyforge.org/tracker/index.php?func=detail&aid=28054&group_id=293&atid=1194).
* Made it much easier to update MIME types from this point forward.
* Updated MIME types from IANA.
-== MIME::Types 1.16
+== 1.16
* Made compatible with Ruby 1.8.6, 1.8.7, and 1.9.1.
* Switched to the 'hoe' gem system and added a lot of build-time tools.
* Updated the MIME types to the list based on the values in the Perl library
@@ -29,7 +176,7 @@
starting soon on MIME::Types 2.x with richer data querying mechanisms
and support for external data sources.
-== MIME::Types 1.15
+== 1.15
* Removed lib/mime/type.rb to form a single MIME::Types database source. It
is unlikely that one will ever need MIME::Type without MIME::Types.
* Re-synchronized the MIME type list with the sources, focusing primarily on
@@ -43,7 +190,7 @@
priority as of this release. The data format and information has changed.
* Removed MIME::Types.by_suffix and MIME::Types.by_mediatype.
-== MIME::Types 1.13.1
+== 1.13.1
* Fixed a problem with the installer running tests. This now works.
* Improved the implementation of MIME::Type.signature?
* Moved code around to use the class << self idiom instead of always
@@ -51,13 +198,13 @@
* Added two new best-guess implementations of functions found in Perl's
MIME::Types implementation (1.13). Do not rely on these until the purpose
and implementation is stabilised.
-* Updated the MIME list to reflect changes noted by
+* Updated the MIME list to reflect changes noted by
Ville Skyttä .
* Added a new constant to MIME::Types, DATA_VERSION. This will allow the Ruby
version number to be updated separately from the Perl version while keeping
the MIME Type list version in sync.
-== MIME::Types 1.13
+== 1.13
! WARNING: This version changes the API of MIME::Types !
! WARNING: This version is compatible with Ruby 1.8 and higher ONLY !
* Removed dependency on InstallPackage; offering 1.13 as either .tar.gz or
@@ -96,33 +243,22 @@
exchange between the two projects.
* Added additional unit tests from Mark Overmeer's 1.12 version.
-== MIME::Types 1.07
+== 1.07
* Changed version numbering to match Perl MIME::Types 1.07.
* Re-synchronized with Mark Overmeer's list in Perl PMIME::Types 1.07.
* [NN Poster] updated the attributes for the PGP types.
-== MIME::Types 1.005
+== 1.005
* Changed to Phil Thomson's InstallPackage.
* Added several types from Perl MIME::Types 1.005.
* Cleaned up data format; some data formats will show up with proper data now.
-== MIME::Types 1.004
+== 1.004
* Updated to match Perl MIME::Types 1.004, links credited to Dan Puro. Adds
new reference list to http://www.indiana.edu/cgi-bin-local/mimetypes
* Removed InvalidType and replaced with TypeError.
* Changed instances of #type to #class.
* Cleaned up how simplified versions are created.
-== MIME::Types 1.003
+== 1.003
* Initial release based on Perl MIME::Types 1.003.
-
-== Copyright
- MIME::Types
- A Ruby implementation of a MIME Types information library. Based in spirit
- on the Perl MIME::Types information library by Mark Overmeer.
- http://rubyforge.org/projects/mime-types/
-
- Licensed under the Ruby disjunctive licence with the GNU GPL or the Perl
- Artistic licence. See Licence.txt for more information.
-
- Copyright 2003 - 2009 Austin Ziegler
diff -Nru ruby-mime-types-1.17.2/Licence.rdoc ruby-mime-types-1.25/Licence.rdoc
--- ruby-mime-types-1.17.2/Licence.rdoc 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/Licence.rdoc 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,37 @@
+== Licence
+
+This software is available under three licenses: the GNU GPL version 2 (or at
+your option, a later version), the Perl Artistic license, or the MIT license.
+Note that my preference for licensing is the MIT license, but the original Perl
+MIME::Types was dually originally licensed with the Perl Artistic and the GNU
+GPL ("the same terms as Perl itself") and given that the Ruby implementation
+hewed pretty closely to the Perl version, I must maintain the additional
+licensing terms.
+
+* Copyright 2003–2013 Austin Ziegler.
+* Adapted from MIME::Types (Perl) by Mark Overmeer.
+
+=== MIT License
+
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+=== Perl Artistic License (version 2)
+See the file docs/artistic.txt in the main distribution.
+
+=== GNU GPL version 2
+See the file docs/COPYING.txt in the main distribution.
diff -Nru ruby-mime-types-1.17.2/License.rdoc ruby-mime-types-1.25/License.rdoc
--- ruby-mime-types-1.17.2/License.rdoc 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/License.rdoc 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-== License
-
-This software is available under a triple disjunctive license:
-{Ruby's license}[http://www.ruby-lang.org/en/LICENSE.txt],
-the
-{Perl Artistic license}[http://www.perl.com/pub/a/language/misc/Artistic.html],
-or the {GNU GPL version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html]
-(or at your option, any later verison).
-
-If you do not accept one of these licences, you may not use this software.
diff -Nru ruby-mime-types-1.17.2/Manifest.txt ruby-mime-types-1.25/Manifest.txt
--- ruby-mime-types-1.17.2/Manifest.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/Manifest.txt 2013-09-14 14:09:18.000000000 +0000
@@ -1,9 +1,16 @@
+.gemtest
.hoerc
+.travis.yml
+Contributing.rdoc
+Gemfile
History.rdoc
-License.rdoc
+Licence.rdoc
Manifest.txt
README.rdoc
Rakefile
+docs/COPYING.txt
+docs/artistic.txt
+lib/mime-types.rb
lib/mime/types.rb
lib/mime/types/application
lib/mime/types/application.mac
@@ -29,14 +36,7 @@
lib/mime/types/video
lib/mime/types/video.nonstandard
lib/mime/types/video.obsolete
-mime-types.gemspec
test/test_mime_type.rb
test/test_mime_types.rb
-type-lists/application.txt
-type-lists/audio.txt
-type-lists/image.txt
-type-lists/message.txt
-type-lists/model.txt
-type-lists/multipart.txt
-type-lists/text.txt
-type-lists/video.txt
+test/test_mime_types_cache.rb
+test/test_mime_types_lazy.rb
diff -Nru ruby-mime-types-1.17.2/README.rdoc ruby-mime-types-1.25/README.rdoc
--- ruby-mime-types-1.17.2/README.rdoc 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/README.rdoc 2013-09-14 14:09:18.000000000 +0000
@@ -1,19 +1,93 @@
= MIME::Types for Ruby
+home :: http://mime-types.rubyforge.org/
+code :: https://github.com/halostatue/mime-types/
+bugs :: https://github.com/halostatue/mime-types/issues
+rdoc :: http://mime-types.rubyforge.org/
+code climate :: {
}[https://codeclimate.com/github/halostatue/mime-types]
+continuous integration :: {
}[https://travis-ci.org/halostatue/mime-types]
+
== Description
This library allows for the identification of a file's likely MIME content
-type. This is release 1.17.2. The identification of MIME content type is based
-on a file's filename extensions.
+type. This is release 1.25, adding experimental caching and lazy loading
+functionality.
+
+The caching and lazy loading features were initially implemented by Greg
+Brockman (gdb). As these features are experimental, they are disabled by
+default and must be enabled through the use of environment variables. The cache
+is invalidated on a per-version basis; the cache for version 1.25 will not be
+reused for version 1.26.
+
+To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
+to any value other than 'false'. When using lazy loading, the initial startup
+of MIME::Types is around 12–25× faster than normal startup (on my system,
+normal startup is about 90 ms; lazy startup is about 4 ms). This isn't
+generally useful, however, as the MIME::Types database has not been loaded.
+Lazy startup and load is just *slightly* faster—around 1 ms. The real advantage
+comes from using the cache.
+
+To enable the cache, set the environment variable +RUBY_MIME_TYPES_CACHE+ to a
+filename where MIME::Types will have read-write access. The first time a new
+version of MIME::Types is run using this file, it will be created, taking a
+little longer than normal. Subsequent loads using the same cache file will be
+approximately 3½× faster (25 ms) than normal loads. This can be combined with
++RUBY_MIME_TYPES_LAZY_LOAD+, but this is *not* recommended in a multithreaded
+or multiprocess environment where all threads or processes will be using the
+same cache file.
+
+As the caching interface is still experimental, the only values cached are the
+default MIME::Types database, not any custom MIME::Types added by users.
+
+MIME types are used in MIME-compliant communications, as in e-mail or HTTP
+traffic, to indicate the type of content which is transmitted. MIME::Types
+provides the ability for detailed information about MIME entities (provided as
+a set of MIME::Type objects) to be determined and used programmatically. There
+are many types defined by RFCs and vendors, so the list is long but not
+complete; don't hesitate to ask to add additional information. This library
+follows the IANA collection of MIME types (see below for reference).
+
+MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark
+Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the
+MIME::Type list has changed and the synchronization will no longer happen.
+
+MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
+tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
+({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
+added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
+and added by the users of MIME::Types.
+
+== Synopsis
+
+MIME types are used in MIME entities, as in email or HTTP traffic. It is useful
+at times to have information available about MIME types (or, inversely, about
+files). A MIME::Type stores the known information about one MIME type.
+
+ require 'mime/types'
+
+ plaintext = MIME::Types['text/plain']
+ # returns [text/plain, text/plain]
+ text = plaintext.first
+ puts text.media_type # => 'text'
+ puts text.sub_type # => 'plain'
+
+ puts text.extensions.join(" ") # => 'txt asc c cc h hh cpp hpp dat hlp'
+
+ puts text.encoding # => quoted-printable
+ puts text.binary? # => false
+ puts text.ascii? # => true
+ puts text.obsolete? # => false
+ puts text.registered? # => true
+ puts text == 'text/plain' # => true
+ puts MIME::Type.simplified('x-appl/x-zip')
+ # => 'appl/zip'
+
+ puts MIME::Types.any? { |type|
+ type.content_type == 'text/plain'
+ } # => true
+ puts MIME::Types.all?(&:registered?)
+ # => false
-MIME::Types for Ruby originally based on and synchronized with MIME::Types for
-Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
-format for the MIME::Type list has changed and the synchronization will no
-longer happen.
-
-Homepage:: http://mime-types.rubyforge.org/
-GitHub:: http://github.com/halostatue/mime-types/
-Copyright:: 2002 - 2011, Austin Ziegler
- Based in part on prior work copyright Mark Overmeer
+:include: Contributing.rdoc
-:include: License.rdoc
+:include: Licence.rdoc
diff -Nru ruby-mime-types-1.17.2/Rakefile ruby-mime-types-1.25/Rakefile
--- ruby-mime-types-1.17.2/Rakefile 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/Rakefile 2013-09-14 14:09:18.000000000 +0000
@@ -3,31 +3,74 @@
require 'rubygems'
require 'hoe'
+Hoe.plugin :bundler
Hoe.plugin :doofus
-Hoe.plugin :gemspec
-Hoe.plugin :rubyforge
+Hoe.plugin :email
+Hoe.plugin :gemspec2
Hoe.plugin :git
+Hoe.plugin :rubyforge
Hoe.plugin :minitest
+Hoe.plugin :travis
spec = Hoe.spec 'mime-types' do
- self.rubyforge_name = self.name
-
developer('Austin Ziegler', 'austin@rubyforge.org')
- self.url = "http://mime-types.rubyforge.org/"
- self.remote_rdoc_dir = 'rdoc'
+ self.remote_rdoc_dir = '.'
self.rsync_args << ' --exclude=statsvn/'
self.history_file = 'History.rdoc'
self.readme_file = 'README.rdoc'
self.extra_rdoc_files = FileList["*.rdoc"].to_a
+ self.licenses = ["MIT", "Artistic 2.0", "GPL-2"]
- self.extra_dev_deps << ['nokogiri', '~> 1.5']
- self.extra_dev_deps << ['minitest', '~> 2.0']
+ self.extra_dev_deps << ['hoe-bundler', '~> 1.2']
self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
- self.extra_dev_deps << ['hoe-gemspec', '~> 1.0']
- self.extra_dev_deps << ['hoe-git', '~> 1.0']
- self.extra_dev_deps << ['hoe-seattlerb', '~> 1.0']
+ self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
+ self.extra_dev_deps << ['hoe-git', '~> 1.5']
+ self.extra_dev_deps << ['hoe-rubygems', '~> 1.0']
+ self.extra_dev_deps << ['hoe-travis', '~> 1.2']
+ self.extra_dev_deps << ['minitest', '~> 4.5']
+ self.extra_dev_deps << ['rake', '~> 10.0']
+end
+
+def reload_mime_types(repeats = 1, force_load = false)
+ repeats.times {
+ Object.send(:remove_const, :MIME) if defined? MIME
+ load 'lib/mime/types.rb'
+ MIME::Types.send(:__types__) if force_load
+ }
+end
+
+desc 'Benchmark'
+task :benchmark, :repeats do |t, args|
+ repeats = args.repeats.to_i
+ repeats = 50 if repeats.zero?
+ require 'benchmark'
+ $LOAD_PATH.unshift 'lib'
+
+ cache_file = File.expand_path('../cache.mtx', __FILE__)
+ rm cache_file if File.exist? cache_file
+
+ Benchmark.bm(17) do |x|
+ x.report("Normal:") { reload_mime_types repeats }
+
+ ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
+ x.report("Lazy:") { reload_mime_types repeats }
+ x.report("Lazy+Load:") { reload_mime_types repeats, true }
+
+ ENV.delete('RUBY_MIME_TYPES_LAZY_LOAD')
+
+ ENV['RUBY_MIME_TYPES_CACHE'] = cache_file
+ reload_mime_types
+
+ x.report("Cached:") { reload_mime_types repeats }
+ ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
+ x.report("Lazy Cached:") { reload_mime_types repeats }
+ x.report("Lazy Cached Load:") { reload_mime_types repeats, true }
+
+ end
+
+ rm cache_file
end
namespace :mime do
@@ -112,7 +155,10 @@
elems = node.children.select { |n| n.elem? }
next if elems.size.zero?
- raise "size mismatch #{elems.size} != #{node_count}" if node_count != elems.size
+ if elems.size != node_count
+ warn "size mismatch (#{elems.size} != #{node_count}) in node: #{node}"
+ next
+ end
case elems.size
when 3
@@ -131,21 +177,21 @@
when CONTACT_PEOPLE
tag = CGI::unescape($1).chomp.strip
if tag == ref.content
- "[#{ref.content}]"
+ "[#{ref.content}]"
else
- "[#{ref.content}=#{tag}]"
+ "[#{ref.content}=#{tag}]"
end
when RFC_EDITOR, IETF_RFC, IETF_RFC_TOOLS
- "RFC#$1"
+ "RFC#$1"
when %r{(https?://.*)}
- "{#{ref.content}=#$1}"
+ "{#{ref.content}=#$1}"
else
ref
end
}
refs = refnodes.join(',')
- "#@type/#{subtype} 'IANA,#{refs}"
+ "#@type/#{subtype} 'IANA,#{refs}"
end.compact
@mime_types
@@ -172,10 +218,10 @@
parser.save_html
end
- puts "Parsing #{parser.name} HTML"
- parser.parse
-
if :text == save_type || :both == save_type
+ puts "Parsing #{parser.name} HTML"
+ parser.parse
+
puts "Saving #{parser.name}.txt"
parser.save_text
end
@@ -189,7 +235,7 @@
http://www.ltsw.se/knbase/internet/mime.htp
http://www.webmaster-toolkit.com/mime-types.shtml
http://plugindoc.mozdev.org/winmime.php
-http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
+http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
http://www.feedforall.com/mime-types.htm
http://www.iana.org/assignments/media-types/
EOS
Binary files /tmp/pxjD06rekw/ruby-mime-types-1.17.2/checksums.yaml.gz and /tmp/Zrr83tjql5/ruby-mime-types-1.25/checksums.yaml.gz differ
Binary files /tmp/pxjD06rekw/ruby-mime-types-1.17.2/checksums.yaml.gz.sig and /tmp/Zrr83tjql5/ruby-mime-types-1.25/checksums.yaml.gz.sig differ
Binary files /tmp/pxjD06rekw/ruby-mime-types-1.17.2/data.tar.gz.sig and /tmp/Zrr83tjql5/ruby-mime-types-1.25/data.tar.gz.sig differ
diff -Nru ruby-mime-types-1.17.2/debian/changelog ruby-mime-types-1.25/debian/changelog
--- ruby-mime-types-1.17.2/debian/changelog 2011-12-20 18:25:55.000000000 +0000
+++ ruby-mime-types-1.25/debian/changelog 2013-11-12 10:20:27.000000000 +0000
@@ -1,3 +1,41 @@
+ruby-mime-types (1.25-1~ubuntu12.04.1~ppa1) precise; urgency=low
+
+ * No-change backport to precise
+
+ -- Neil Wilson Tue, 12 Nov 2013 10:20:27 +0000
+
+ruby-mime-types (1.25-1) unstable; urgency=low
+
+ * Imported Upstream version 1.25
+ * debian/patches: drop ignore-refutation.diff, not needed anymore
+ * debian/control: built against ruby-minitest >= 0.5
+ * debian/ruby-test-files.yaml: add minitest to the required files
+
+ -- Cédric Boutillier Sat, 14 Sep 2013 16:13:18 +0200
+
+ruby-mime-types (1.23-1) unstable; urgency=low
+
+ * New upstream version
+ * debian/control:
+ + update my email address
+ + remove obsolete DM-Upload-Allowed flag
+ + use canonical URI in Vcs-* fields
+ + drop transitional packages
+ + depend on ruby instead of ruby1.8
+ + Bump Standards-Version to 3.9.4 (no changes needed)
+ * debian/rules: install upstream changelog
+
+ -- Cédric Boutillier Tue, 14 May 2013 16:08:59 +0200
+
+ruby-mime-types (1.19-1) unstable; urgency=low
+
+ * New upstream version
+ * Bump Standars-Version to 3.9.3 (no changes needed)
+ * Add myself to Uploaders:
+ * Build-depend on gem2deb >=0.3.0
+
+ -- Cédric Boutillier Tue, 26 Jun 2012 10:07:11 +0200
+
ruby-mime-types (1.17.2-1) unstable; urgency=low
* New upstream release.
diff -Nru ruby-mime-types-1.17.2/debian/control ruby-mime-types-1.25/debian/control
--- ruby-mime-types-1.17.2/debian/control 2011-12-20 18:28:06.000000000 +0000
+++ ruby-mime-types-1.25/debian/control 2013-09-14 14:20:09.000000000 +0000
@@ -2,32 +2,19 @@
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers
-Uploaders: Lucas Nussbaum
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-minitest
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-mime-types.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-mime-types.git;a=summary
+Uploaders: Lucas Nussbaum , Cédric Boutillier
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-minitest (>= 5.0~)
+Standards-Version: 3.9.4
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mime-types.git
+Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-mime-types.git;a=summary
Homepage: http://mime-types.rubyforge.org/
XS-Ruby-Versions: all
Package: ruby-mime-types
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-Replaces: libmime-types-ruby (<< 1.16-3~)
-Conflicts: libmime-types-ruby (<< 1.16-3~)
-Provides: libmime-types-ruby
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
Description: guess MIME type of files
This library allows for the identification of a file's likely MIME
content type. The identification of MIME content type is based on a
file's filename extensions.
-
-Package: libmime-types-ruby
-Priority: extra
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends}, ruby-mime-types
-Description: Transitional package for ruby-mime-types
- This is a transitional package to ease upgrades to the ruby-mime-types
- package. It can safely be removed.
diff -Nru ruby-mime-types-1.17.2/debian/copyright ruby-mime-types-1.25/debian/copyright
--- ruby-mime-types-1.17.2/debian/copyright 2011-10-09 13:16:55.000000000 +0000
+++ ruby-mime-types-1.25/debian/copyright 2012-06-26 08:12:52.000000000 +0000
@@ -1,90 +1,91 @@
-This package was debianized by Decklin Foster on
-Thu, 26 Jun 2008 16:48:06 -0400.
-
-It was downloaded from http://mime-types.rubyforge.org/
-
-Upstream Author:
-
- Austin Ziegler
-
-Copyright:
-
- Copyright (C) 2002 - 2006, Austin Ziegler
- Based on prior work copyright Mark Overmeer
-
-License:
-
- MIME::Types is available under three disjunctive licences: Ruby's licence,
- Perl Artistic Licence, GNU GPL version 2 (or later).
-
-Ruby's License:
-
- Ruby is copyrighted free software by Yukihiro Matsumoto .
- You can redistribute it and/or modify it under either the terms of the GPL
- (see the file GPL), or the conditions below:
-
- 1. You may make and give away verbatim copies of the source form of the
- software without restriction, provided that you duplicate all of the
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
- b) use the modified software only within your corporation or
- organization.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or binary form,
- provided that you do at least ONE of the following:
-
- a) distribute the binaries and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
-
- b) accompany the distribution with the machine-readable source of
- the software.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 4. You may modify and include the part of the software into any other
- software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under these terms.
-
- For the list of those files and their copying conditions, see the
- file LEGAL.
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
-
-Artistic License:
-
- On Debian systems, the complete text of the Artistic License can be found
- in `/usr/share/common-licenses/Artistic`.
-
-GNU General Public License:
-
- On Debian systems, the complete text of the GNU General Public License can
- be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2008, Decklin Foster and
-is licensed under the GPL.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: mime-types
+Source: http://mime-types.rubyforge.org/
+
+Files: *
+Copyright: 2003-2012, Austin Ziegler
+License: Ruby or GPL-2+ or Artistic
+Comment: Based on prior work copyright Mark Overmeer
+
+Files: debian/*
+Copyright: 2008, Decklin Foster
+License: GPL-2+
+
+License: Ruby
+ Ruby is copyrighted free software by Yukihiro Matsumoto .
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see the file GPL), or the conditions below:
+ .
+ 1. You may make and give away verbatim copies of the source form of the
+ software without restriction, provided that you duplicate all of the
+ original copyright notices and associated disclaimers.
+ .
+ 2. You may modify your copy of the software in any way, provided that
+ you do at least ONE of the following:
+ .
+ a) place your modifications in the Public Domain or otherwise
+ make them Freely Available, such as by posting said
+ modifications to Usenet or an equivalent medium, or by allowing
+ the author to include your modifications in the software.
+ .
+ b) use the modified software only within your corporation or
+ organization.
+ .
+ c) give non-standard binaries non-standard names, with
+ instructions on where to get the original software distribution.
+ .
+ d) make other distribution arrangements with the author.
+ .
+ 3. You may distribute the software in object code or binary form,
+ provided that you do at least ONE of the following:
+ .
+ a) distribute the binaries and library files of the software,
+ together with instructions (in the manual page or equivalent)
+ on where to get the original distribution.
+ .
+ b) accompany the distribution with the machine-readable source of
+ the software.
+ .
+ c) give non-standard binaries non-standard names, with
+ instructions on where to get the original software distribution.
+ .
+ d) make other distribution arrangements with the author.
+ .
+ 4. You may modify and include the part of the software into any other
+ software (possibly commercial). But some files in the distribution
+ are not written by the author, so that they are not under these terms.
+ .
+ For the list of those files and their copying conditions, see the
+ file LEGAL.
+ .
+ 5. The scripts and library files supplied as input to or produced as
+ output from the software do not automatically fall under the
+ copyright of the software, but belong to whomever generated them,
+ and may be sold commercially, and may be aggregated with this
+ software.
+ .
+ 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE.
+
+License: Artistic
+ On Debian systems, the complete text of the Artistic License can be found
+ in `/usr/share/common-licenses/Artistic`.
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff -Nru ruby-mime-types-1.17.2/debian/patches/ignore-refutation.diff ruby-mime-types-1.25/debian/patches/ignore-refutation.diff
--- ruby-mime-types-1.17.2/debian/patches/ignore-refutation.diff 2011-12-20 18:25:08.000000000 +0000
+++ ruby-mime-types-1.25/debian/patches/ignore-refutation.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Description: ignore refutation to fix tests
-Upstream-bug: https://github.com/halostatue/mime-types/issues/8
-
---- ruby-mime-types-1.17.2.orig/test/test_mime_type.rb
-+++ ruby-mime-types-1.17.2/test/test_mime_type.rb
-@@ -179,7 +179,7 @@ class TestMIME_Type < MiniTest::Unit::Te
-
- def test_platform_eh
- yaml = yaml_mime_type_from_array
-- refute(yaml.platform?)
-+ #refute(yaml.platform?)
- yaml.system = nil
- refute(yaml.platform?)
- yaml.system = %r{#{RUBY_PLATFORM}}
diff -Nru ruby-mime-types-1.17.2/debian/patches/series ruby-mime-types-1.25/debian/patches/series
--- ruby-mime-types-1.17.2/debian/patches/series 2011-12-20 18:20:52.000000000 +0000
+++ ruby-mime-types-1.25/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-ignore-refutation.diff
diff -Nru ruby-mime-types-1.17.2/debian/ruby-test-files.yaml ruby-mime-types-1.25/debian/ruby-test-files.yaml
--- ruby-mime-types-1.17.2/debian/ruby-test-files.yaml 2011-10-09 13:16:55.000000000 +0000
+++ ruby-mime-types-1.25/debian/ruby-test-files.yaml 2013-09-14 14:27:51.000000000 +0000
@@ -1,3 +1,4 @@
----
+---
+- minitest
- test/test_mime_type.rb
- test/test_mime_types.rb
diff -Nru ruby-mime-types-1.17.2/debian/rules ruby-mime-types-1.25/debian/rules
--- ruby-mime-types-1.17.2/debian/rules 2011-10-09 13:16:55.000000000 +0000
+++ ruby-mime-types-1.25/debian/rules 2013-06-20 15:02:10.000000000 +0000
@@ -13,3 +13,6 @@
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_installchangelogs:
+ dh_installchangelogs History.rdoc
diff -Nru ruby-mime-types-1.17.2/docs/COPYING.txt ruby-mime-types-1.25/docs/COPYING.txt
--- ruby-mime-types-1.17.2/docs/COPYING.txt 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/docs/COPYING.txt 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ , 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff -Nru ruby-mime-types-1.17.2/docs/artistic.txt ruby-mime-types-1.25/docs/artistic.txt
--- ruby-mime-types-1.17.2/docs/artistic.txt 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/docs/artistic.txt 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,127 @@
+The "Artistic License"
+
+ Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+Definitions:
+
+ "Package" refers to the collection of files distributed by the
+ Copyright Holder, and derivatives of that collection of files
+ created through textual modification.
+
+ "Standard Version" refers to such a Package if it has not been
+ modified, or has been modified in accordance with the wishes
+ of the Copyright Holder as specified below.
+
+ "Copyright Holder" is whoever is named in the copyright or
+ copyrights for the package.
+
+ "You" is you, if you're thinking about copying or distributing
+ this Package.
+
+ "Reasonable copying fee" is whatever you can justify on the
+ basis of media cost, duplication charges, time of people involved,
+ and so on. (You will not be required to justify it to the
+ Copyright Holder, but only to the computing community at large
+ as a market that must bear the fee.)
+
+ "Freely Available" means that no fee is charged for the item
+ itself, though there may be fees involved in handling the item.
+ It also means that recipients of the item may redistribute it
+ under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder. A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+ a) place your modifications in the Public Domain or otherwise make them
+ Freely Available, such as by posting said modifications to Usenet or
+ an equivalent medium, or placing the modifications on a major archive
+ site such as uunet.uu.net, or by allowing the Copyright Holder to include
+ your modifications in the Standard Version of the Package.
+
+ b) use the modified Package only within your corporation or organization.
+
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided, and provide
+ a separate manual page for each non-standard executable that clearly
+ documents how it differs from the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+ a) distribute a Standard Version of the executables and library files,
+ together with instructions (in the manual page or equivalent) on where
+ to get the Standard Version.
+
+ b) accompany the distribution with the machine-readable source of
+ the Package with your modifications.
+
+ c) give non-standard executables non-standard names, and clearly
+ document the differences in manual pages (or equivalent), together
+ with instructions on where to get the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package. You may charge any fee you choose for support of this
+Package. You may not charge a fee for this Package itself. However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own. You may embed this Package's interpreter within
+an executable of yours (by linking); this shall be construed as a mere
+form of aggregation, provided that the complete Standard Version of the
+interpreter is so embedded.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whoever generated
+them, and may be sold commercially, and may be aggregated with this
+Package. If such scripts or library files are aggregated with this
+Package via the so-called "undump" or "unexec" methods of producing a
+binary executable image, then distribution of such an image shall
+neither be construed as a distribution of this Package nor shall it
+fall under the restrictions of Paragraphs 3 and 4, provided that you do
+not represent such an executable image as a Standard Version of this
+Package.
+
+7. C subroutines (or comparably compiled subroutines in other
+languages) supplied by you and linked into this Package in order to
+emulate subroutines and variables of the language defined by this
+Package shall not be considered part of this Package, but are the
+equivalent of input as in Paragraph 6, provided these subroutines do
+not change the language in any way that would cause it to fail the
+regression tests for the language.
+
+8. Aggregation of this Package with a commercial distribution is always
+permitted provided that the use of this Package is embedded; that is,
+when no overt attempt is made to make this Package's interfaces visible
+to the end user of the commercial distribution. Such use shall not be
+construed as a distribution of this Package.
+
+9. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ The End
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/application ruby-mime-types-1.25/lib/mime/types/application
--- ruby-mime-types-1.17.2/lib/mime/types/application 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/application 2013-09-14 14:09:18.000000000 +0000
@@ -1,23 +1,20 @@
application/1d-interleaved-parityfec 'IANA,RFC6015
application/3gpp-ims+xml 'IANA,[Meredith]
-application/CSTAdata+xml 'IANA,[Ecma International Helpdesk]
-application/EDI-Consent 'IANA,RFC1767
-application/EDI-X12 'IANA,RFC1767
-application/EDIFACT 'IANA,RFC1767
-application/H224 'IANA,RFC4573
application/activemessage 'IANA,[Shapiro]
application/andrew-inset 'IANA,[Borenstein]
application/applefile :base64 'IANA,[Faltstrom]
application/atom+xml @atom :8bit 'IANA,RFC4287,RFC5023
application/atomcat+xml :8bit 'IANA,RFC5023
+application/atomdeleted+xml :8bit 'IANA,RFC6721
application/atomicmail 'IANA,[Borenstein]
application/atomsvc+xml :8bit 'IANA,RFC5023
application/auth-policy+xml :8bit 'IANA,RFC4745
application/batch-SMTP 'IANA,RFC2442
application/beep+xml 'IANA,RFC3080
application/calendar+xml 'IANA,RFC6321
+application/call-completion 'IANA,RFC6910
application/cals-1840 'IANA,RFC1895
-application/ccmp+xml 'IANA,{RFC-ietf-xcon-ccmp-15.txt=http://http://tools.ietf.org/html/draft-ietf-xcon-ccmp}
+application/ccmp+xml 'IANA,RFC6503
application/ccxml+xml 'IANA,RFC4267
application/cdmi-capability 'IANA,RFC6208
application/cdmi-container 'IANA,RFC6208
@@ -32,28 +29,38 @@
application/conference-info+xml 'IANA,RFC4575
application/cpl+xml 'IANA,RFC3880
application/csta+xml 'IANA,[Ecma International Helpdesk]
+application/CSTAdata+xml 'IANA,[Ecma International Helpdesk]
application/cybercash 'IANA,[Eastlake]
+application/dash+xml 'IANA,[Stockhammer]
application/davmount+xml 'IANA,RFC4709
application/dca-rft 'IANA,[Campbell]
application/dec-dx 'IANA,[Campbell]
application/dialog-info+xml 'IANA,RFC4235
-application/dicom 'IANA,RFC3240
+application/dicom @dcm 'IANA,RFC3240
application/dns 'IANA,RFC4027
application/dskpp+xml 'IANA,RFC6063
application/dssc+der 'IANA,RFC5698
application/dssc+xml 'IANA,RFC5698
application/dvcs 'IANA,RFC3029
application/ecmascript 'IANA,RFC4329
+application/EDI-Consent 'IANA,RFC1767
+application/EDI-X12 'IANA,RFC1767
+application/EDIFACT 'IANA,RFC1767
application/emma+xml 'IANA,[W3C]
+application/encaprtp 'IANA,RFC6849
application/epp+xml 'IANA,RFC5730
application/eshop 'IANA,[Katz]
application/example 'IANA,RFC4735
application/exi 'IANA,[W3C]
application/fastinfoset 'IANA,[ITU-T ASN.1 Rapporteur]
application/fastsoap 'IANA,[ITU-T ASN.1 Rapporteur]
+application/fdt+xml 'IANA,RFC6726
application/fits 'IANA,RFC4047
application/font-tdpfr @pfr 'IANA,RFC3073
+application/font-woff @woff :base64 'IANA,[W3C]
application/framework-attributes+xml 'IANA,RFC6230
+application/gzip 'IANA,RFC6713
+application/H224 'IANA,RFC4573
application/held+xml 'IANA,RFC5985
application/http 'IANA,RFC2616
application/hyperstudio @stk 'IANA,[Domino]
@@ -74,9 +81,12 @@
application/isup 'IANA,RFC3204
application/javascript @js :8bit 'IANA,RFC4329
application/json @json :8bit 'IANA,RFC4627
+application/json-patch+json 'IANA,RFC6902
application/kpml-request+xml 'IANA,RFC4730
application/kpml-response+xml 'IANA,RFC4730
+application/link-format 'IANA,RFC6690
application/lost+xml 'IANA,RFC5222
+application/lostsync+xml 'IANA,RFC6739
application/mac-binhex40 @hqx :8bit 'IANA,[Faltstrom]
application/macwriteii 'IANA,[Lindner]
application/mads+xml 'IANA,RFC6207
@@ -95,8 +105,10 @@
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
application/media_control+xml 'IANA,RFC5168
application/mediaservercontrol+xml 'IANA,RFC5022
application/metalink4+xml 'IANA,RFC5854
@@ -108,26 +120,30 @@
application/mosskey-data 'IANA,RFC1848
application/mosskey-request 'IANA,RFC1848
application/mp21 'IANA,RFC6381,[Singer]
-application/mp4 @mp4,mpg4 'IANA,RFC4337
+application/mp4 @mp4,mpg4 'IANA,RFC4337,RFC6381
application/mpeg4-generic 'IANA,RFC3640
application/mpeg4-iod 'IANA,RFC4337
application/mpeg4-iod-xmt 'IANA,RFC4337
+application/mrb-consumer+xml 'IANA,RFC6917
+application/mrb-publish+xml 'IANA,RFC6917
application/msc-ivr+xml 'IANA,RFC6231
-application/msc-mixer+xml 'IANA,{RFC-ietf-mediactrl-mixer-control-package-14=http://tools.ietf.org/html/draft-ietf-mediactrl-mixer-control-package}
+application/msc-mixer+xml 'IANA,RFC6505
application/msword @doc,dot,wrd :base64 'IANA,[Lindner]
-application/mxf 'IANA,RFC4539
+application/mxf @mxf 'IANA,RFC4539
application/nasdata 'IANA,RFC4707
application/news-checkgroups 'IANA,RFC5537
application/news-groupinfo 'IANA,RFC5537
-application/news-transmission 'IANA,RFC5537,[Spencer]
+application/news-transmission 'IANA,RFC5537
+application/nlsml+xml 'IANA,RFC6787
application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,RFC2560
-application/ocsp-response 'IANA,RFC2560
-application/octet-stream @bin,dms,lha,lzh,exe,class,ani,pgp,so,dll,dmg,dylib :base64 'IANA,RFC2045,RFC2046
+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
application/ogg @ogx 'IANA,RFC5334
application/oxps 'IANA,[Ecma International Helpdesk]
+application/p2p-overlay+xml 'IANA,{RFC-ietf-p2psip-base-26=http://tools.ietf.org/html/draft-ietf-p2psip-base}
application/parityfec 'IANA,RFC5109
application/patch-ops-error+xml 'IANA,RFC5261
application/pdf @pdf :base64 'IANA,RFC3778
@@ -138,7 +154,7 @@
application/pidf-diff+xml 'IANA,RFC5262
application/pkcs10 @p10 'IANA,RFC5967
application/pkcs7-mime @p7m,p7c 'IANA,RFC5751
-application/pkcs7-signature @p7s 'IANA,RFC2311
+application/pkcs7-signature @p7s 'IANA,RFC5751
application/pkcs8 'IANA,RFC5958
application/pkix-attr-cert 'IANA,RFC5877
application/pkix-cert @cer 'IANA,RFC2585
@@ -148,6 +164,7 @@
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]
@@ -156,6 +173,7 @@
application/prs.xsf+xml 'IANA,[Stührenberg=Stuhrenberg]
application/pskc+xml 'IANA,RFC6030
application/qsig 'IANA,RFC3204
+application/raptorfec 'IANA,RFC6682
application/rdf+xml @rdf :8bit 'IANA,RFC3870
application/reginfo+xml 'IANA,RFC3680
application/relax-ng-compact-syntax 'IANA,{ISO/IEC 19757-2:2003/FDAM-1=http://www.jtc1sc34.org/repository/0661.pdf}
@@ -165,10 +183,12 @@
application/riscos 'IANA,[Smith]
application/rlmi+xml 'IANA,RFC4662
application/rls-services+xml 'IANA,RFC4826
-application/rpki-manifest 'IANA,{RFC-ietf-sidr-repos-struct-09.txt=http://tools.ietf.org/html/draft-ietf-sidr-repos-struct}
-application/rpki-roa 'IANA,{RFC-ietf-sidr-repos-struct-09.txt=http://tools.ietf.org/html/draft-ietf-sidr-repos-struct}
-application/rpki-updown 'IANA,{RFC-ietf-sidr-rescerts-provisioning-11.txt=http://tools.ietf.org/html/draft-ietf-sidr-rescerts-provisioning}
+application/rpki-ghostbusters 'IANA,RFC6493
+application/rpki-manifest 'IANA,RFC6481
+application/rpki-roa 'IANA,RFC6481
+application/rpki-updown 'IANA,RFC6492
application/rtf @rtf 'IANA,[Lindner]
+application/rtploopback 'IANA,RFC6849
application/rtx 'IANA,RFC4588
application/samlassertion+xml 'IANA,[OASIS Security Services Technical Committee (SSTC)]
application/samlmetadata+xml 'IANA,[OASIS Security Services Technical Committee (SSTC)]
@@ -178,6 +198,8 @@
application/scvp-vp-request 'IANA,RFC5055
application/scvp-vp-response 'IANA,RFC5055
application/sdp 'IANA,RFC4566
+application/sep+xml 'IANA,[Robby_Simpson=RoSimpson],[ZigBee_Alliance=ZigBee]
+application/sep-exi 'IANA,[Robby_Simpson=RoSimpson],[ZigBee_Alliance=ZigBee]
application/set-payment 'IANA,[Korver]
application/set-payment-initiation 'IANA,[Korver]
application/set-registration 'IANA,[Korver]
@@ -191,11 +213,13 @@
application/simpleSymbolContainer 'IANA,[3GPP]
application/slate 'IANA,[Crowley]
application/smil+xml @smi,smil :8bit 'IANA,RFC4536
+application/smpte336m 'IANA,RFC6597
application/soap+fastinfoset 'IANA,[ITU-T ASN.1 Rapporteur]
application/soap+xml 'IANA,RFC3902
application/sparql-query 'IANA,[W3C]
application/sparql-results+xml 'IANA,[W3C]
application/spirits-event+xml 'IANA,RFC3910
+application/sql 'IANA,RFC6922
application/srgs 'IANA,RFC4267
application/srgs+xml 'IANA,RFC4267
application/sru+xml 'IANA,RFC6207
@@ -218,9 +242,10 @@
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
-application/vnd.3M.Post-it-Notes 'IANA,[O'Brien]
application/vnd.3gpp.bsf+xml 'IANA,[Meredith]
application/vnd.3gpp.pic-bw-large @plb 'IANA,[Meredith]
application/vnd.3gpp.pic-bw-small @psb 'IANA,[Meredith]
@@ -229,24 +254,12 @@
application/vnd.3gpp2.bcmcsinfo+xml 'IANA,[Dryden]
application/vnd.3gpp2.sms 'IANA,[Mahendran]
application/vnd.3gpp2.tcap 'IANA,[Mahendran]
-application/vnd.FloGraphIt 'IANA,[Floersch]
-application/vnd.HandHeld-Entertainment+xml 'IANA,[Hamilton]
-application/vnd.Kinar @kne,knp,sdf 'IANA,[Thakkar]
-application/vnd.MFER 'IANA,[Hirai]
-application/vnd.Mobius.DAF 'IANA,[Kabayama]
-application/vnd.Mobius.DIS 'IANA,[Kabayama]
-application/vnd.Mobius.MBK 'IANA,[Devasia]
-application/vnd.Mobius.MQY 'IANA,[Devasia]
-application/vnd.Mobius.MSL 'IANA,[Kabayama]
-application/vnd.Mobius.PLC 'IANA,[Kabayama]
-application/vnd.Mobius.TXF 'IANA,[Kabayama]
-application/vnd.Quark.QuarkXPress @qxd,qxt,qwd,qwt,qxl,qxb :8bit 'IANA,[Scheidler]
-application/vnd.RenLearn.rlprint 'IANA,[Wick]
-application/vnd.SimTech-MindMapper 'IANA,[Koh]
+application/vnd.3M.Post-it-Notes 'IANA,[O'Brien]
application/vnd.accpac.simply.aso 'IANA,[Leow]
application/vnd.accpac.simply.imp 'IANA,[Leow]
application/vnd.acucobol 'IANA,[Lubin]
application/vnd.acucorp @atc,acutc :7bit 'IANA,[Lubin]
+application/vnd.adobe.formscentral.fcdt 'IANA,[Solc]
application/vnd.adobe.fxp 'IANA,[Brambley],[Heintz]
application/vnd.adobe.partial-upload 'IANA,[Otala]
application/vnd.adobe.xdp+xml 'IANA,[Brinkman]
@@ -261,6 +274,7 @@
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]
@@ -268,6 +282,7 @@
application/vnd.audiograph 'IANA,[Slusanschi]
application/vnd.autopackage 'IANA,[Hearn]
application/vnd.avistar+xml 'IANA,[Vysotsky]
+application/vnd.balsamiq.bmml+xml 'IANA,[Giacomo_Guilizzoni]
application/vnd.blueice.multipass @mpm 'IANA,[Holmstrom]
application/vnd.bluetooth.ep.oob 'IANA,[Foley]
application/vnd.bmi 'IANA,[Gotoh]
@@ -276,6 +291,7 @@
application/vnd.canon-cpdl 'IANA,[Muto]
application/vnd.canon-lips 'IANA,[Muto]
application/vnd.cendio.thinlinc.clientconf 'IANA,[Åstrand=Astrand]
+application/vnd.century-systems.tcp_stream 'IANA,[Shuji Fujii=Shuji_Fujii]
application/vnd.chemdraw+xml 'IANA,[Howes]
application/vnd.chipnuts.karaoke-mmd 'IANA,[Xiong]
application/vnd.cinderella @cdy 'IANA,[Kortenkamp]
@@ -286,6 +302,7 @@
application/vnd.cluetrust.cartomobile-config 'IANA,[Paulsen]
application/vnd.cluetrust.cartomobile-config-pkg 'IANA,[Paulsen]
application/vnd.collection+json 'IANA,[Amundsen]
+application/vnd.collection.next+json 'IANA,[Ioseb Dzmanashvili=Ioseb_Dzmanashvili]
application/vnd.commerce-battelle 'IANA,[Applebaum]
application/vnd.commonspace 'IANA,[Chandhok]
application/vnd.contact.cmsg 'IANA,[Patz]
@@ -304,19 +321,26 @@
application/vnd.cups-raster 'IANA,[Sweet]
application/vnd.cups-raw 'IANA,[Sweet]
application/vnd.curl @curl 'IANA,[Byrnes]
+application/vnd.cyan.dean.root+xml 'IANA,[Kern]
application/vnd.cybank 'IANA,[Helmee]
+application/vnd.dart 'IANA,[Sandholm]
application/vnd.data-vision.rdz @rdz 'IANA,[Fields]
application/vnd.dece.data 'IANA,[Dolan]
application/vnd.dece.ttml+xml 'IANA,[Dolan]
application/vnd.dece.unspecified 'IANA,[Dolan]
application/vnd.dece.zip 'IANA,[Dolan]
application/vnd.denovo.fcselayout-link 'IANA,[Dixon]
+application/vnd.desmume.movie 'IANA,[Andersson]
application/vnd.dir-bi.plate-dl-nosuffix 'IANA,[Yamanaka]
+application/vnd.dm.delegation+xml 'IANA,[Ferrazzini]
application/vnd.dna 'IANA,[Searcy]
application/vnd.dolby.mobile.1 'IANA,[Hattersley]
application/vnd.dolby.mobile.2 'IANA,[Hattersley]
application/vnd.dpgraph 'IANA,[Parker]
application/vnd.dreamfactory @dfac 'IANA,[Appleton]
+application/vnd.dtg.local 'IANA,[Ali_Teffahi]
+application/vnd.dtg.local.flash 'IANA,[Ali_Teffahi]
+application/vnd.dtg.local.html 'IANA,[Ali_Teffahi]
application/vnd.dvb.ait 'IANA,[Siebert],[Lagally]
application/vnd.dvb.dvbj 'IANA,[Siebert],[Lagally]
application/vnd.dvb.esgcontainer 'IANA,[Heuer]
@@ -368,7 +392,9 @@
application/vnd.etsi.iptvsync+xml 'IANA,[Ortega]
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]
@@ -382,6 +408,7 @@
application/vnd.fdsn.seed 'IANA,[Trabant]
application/vnd.ffsns 'IANA,[Holstage]
application/vnd.fints 'IANA,[Hammann]
+application/vnd.FloGraphIt 'IANA,[Floersch]
application/vnd.fluxtime.clip 'IANA,[Winter]
application/vnd.font-fontforge-sfd 'IANA,[Williams]
application/vnd.framemaker @frm,maker,frame,fm,fb,book,fbdoc 'IANA,[Wexler]
@@ -395,14 +422,14 @@
application/vnd.fujitsu.oasysprs 'IANA,[Ogita]
application/vnd.fujixerox.ART-EX 'IANA,[Tanabe]
application/vnd.fujixerox.ART4 'IANA,[Tanabe]
-application/vnd.fujixerox.HBPL '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]
application/vnd.genomatix.tuxedo @txd 'IANA,[Frey]
-application/vnd.geocube+xml 'IANA,[Pirsch]
application/vnd.geogebra.file 'IANA,[GeoGebra],[Kreis]
application/vnd.geogebra.tool 'IANA,[GeoGebra],[Kreis]
application/vnd.geometry-explorer 'IANA,[Hvidsten]
@@ -424,25 +451,27 @@
application/vnd.groove-vcard 'IANA,[Joseph]
application/vnd.hal+json 'IANA,[Kelly]
application/vnd.hal+xml 'IANA,[Kelly]
+application/vnd.HandHeld-Entertainment+xml 'IANA,[Hamilton]
application/vnd.hbci @hbci,hbc,kom,upa,pkd,bpd 'IANA,[Hammann]
application/vnd.hcl-bireports 'IANA,[Serres]
application/vnd.hhe.lesson-player @les 'IANA,[Jones]
application/vnd.hp-HPGL @plt,hpgl 'IANA,[Pentecost]
-application/vnd.hp-PCL 'IANA,[Pentecost]
-application/vnd.hp-PCLXL 'IANA,[Pentecost]
application/vnd.hp-hpid 'IANA,[Gupta]
application/vnd.hp-hps 'IANA,[Aubrey]
application/vnd.hp-jlyt 'IANA,[Gaash]
+application/vnd.hp-PCL 'IANA,[Pentecost]
+application/vnd.hp-PCLXL 'IANA,[Pentecost]
application/vnd.httphone 'IANA,[Lefevre]
application/vnd.hydrostatix.sof-data 'IANA,[Gillam]
application/vnd.hzn-3d-crossword 'IANA,[Minnis]
-application/vnd.ibm.MiniPay 'IANA,[Herzberg]
application/vnd.ibm.afplinedata 'IANA,[Buis]
application/vnd.ibm.electronic-media @emm 'IANA,[Tantlinger]
+application/vnd.ibm.MiniPay 'IANA,[Herzberg]
application/vnd.ibm.modcap 'IANA,[Hohensee]
application/vnd.ibm.rights-management @irm 'IANA,[Tantlinger]
application/vnd.ibm.secure-container @sc 'IANA,[Tantlinger]
application/vnd.iccprofile 'IANA,[Green]
+application/vnd.ieee.1905 'IANA,[Rajkotia]
application/vnd.igloader 'IANA,[Fisher]
application/vnd.immervision-ivp 'IANA,[Villegas]
application/vnd.immervision-ivu 'IANA,[Villegas]
@@ -450,6 +479,7 @@
application/vnd.informix-visionary 'IANA,[Gales]
application/vnd.infotech.project 'IANA,[Engelke]
application/vnd.infotech.project+xml 'IANA,[Engelke]
+application/vnd.innopath.wamp.notification 'IANA,[Sudo]
application/vnd.insors.igm 'IANA,[Swanson]
application/vnd.intercon.formnet 'IANA,[Gurak]
application/vnd.intergeo 'IANA,[Kreis=Kreis2]
@@ -460,7 +490,9 @@
application/vnd.iptc.g2.conceptitem+xml 'IANA,[Steidl]
application/vnd.iptc.g2.knowledgeitem+xml 'IANA,[Steidl]
application/vnd.iptc.g2.newsitem+xml 'IANA,[Steidl]
+application/vnd.iptc.g2.newsmessage+xml 'IANA,[Steidl]
application/vnd.iptc.g2.packageitem+xml 'IANA,[Steidl]
+application/vnd.iptc.g2.planningitem+xml 'IANA,[Steidl]
application/vnd.ipunplugged.rcprofile @rcprofile 'IANA,[Ersson]
application/vnd.irepository.package+xml @irp 'IANA,[Knowles]
application/vnd.is-xpr 'IANA,[Natarajan]
@@ -477,6 +509,7 @@
application/vnd.jcp.javame.midlet-rms 'IANA,[Gorshenev]
application/vnd.jisp @jisp 'IANA,[Deckers]
application/vnd.joost.joda-archive 'IANA,[Joost]
+application/vnd.jsk.isdn-ngn 'IANA,[Kiyonobu]
application/vnd.kahootz 'IANA,[Macdonald]
application/vnd.kde.karbon @karbon 'IANA,[Faure]
application/vnd.kde.kchart @chrt 'IANA,[Faure]
@@ -488,6 +521,7 @@
application/vnd.kde.kword @kwd,kwt 'IANA,[Faure]
application/vnd.kenameaapp @htke 'IANA,[DiGiorgio-Haag]
application/vnd.kidspiration @kia 'IANA,[Bennett]
+application/vnd.Kinar @kne,knp,sdf 'IANA,[Thakkar]
application/vnd.koan 'IANA,[Cole]
application/vnd.kodak-descriptor 'IANA,[Donahue]
application/vnd.las.las+xml 'IANA,[Bailey=RBailey]
@@ -510,12 +544,20 @@
application/vnd.medcalcdata 'IANA,[Schoonjans]
application/vnd.mediastation.cdkey 'IANA,[Flurry]
application/vnd.meridian-slingshot 'IANA,[Wedel]
+application/vnd.MFER 'IANA,[Hirai]
application/vnd.mfmp @mfm 'IANA,[Ikeda]
application/vnd.micrografx.flo @flo 'IANA,[Prevo]
application/vnd.micrografx.igx @igx 'IANA,[Prevo]
application/vnd.mif @mif 'IANA,[Wexler]
application/vnd.minisoft-hp3000-save 'IANA,[Bartram]
application/vnd.mitsubishi.misty-guard.trustweb 'IANA,[Tanaka]
+application/vnd.Mobius.DAF 'IANA,[Kabayama]
+application/vnd.Mobius.DIS 'IANA,[Kabayama]
+application/vnd.Mobius.MBK 'IANA,[Devasia]
+application/vnd.Mobius.MQY 'IANA,[Devasia]
+application/vnd.Mobius.MSL 'IANA,[Kabayama]
+application/vnd.Mobius.PLC 'IANA,[Kabayama]
+application/vnd.Mobius.TXF 'IANA,[Kabayama]
application/vnd.mophun.application @mpn 'IANA,[Wennerstrom]
application/vnd.mophun.certificate @mpc 'IANA,[Wennerstrom]
application/vnd.motorola.flexsuite 'IANA,[Patton]
@@ -532,8 +574,8 @@
application/vnd.ms-cab-compressed @cab 'IANA,[Scarborough]
application/vnd.ms-excel @xls,xlt :base64 'IANA,[Gill]
application/vnd.ms-excel.addin.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-excel.sheet.binary.macroEnabled.12 @xslb 'IANA,[Rae]
-application/vnd.ms-excel.sheet.macroEnabled.12 @xslm 'IANA,[Rae]
+application/vnd.ms-excel.sheet.binary.macroEnabled.12 @xlsb 'IANA,[Rae]
+application/vnd.ms-excel.sheet.macroEnabled.12 @xlsm 'IANA,[Rae]
application/vnd.ms-excel.template.macroEnabled.12 'IANA,[Rae]
application/vnd.ms-fontobject 'IANA,[Scarborough]
application/vnd.ms-htmlhelp 'IANA,[Techtonik]
@@ -543,15 +585,20 @@
application/vnd.ms-officetheme 'IANA,[Rae]
application/vnd.ms-playready.initiator+xml 'IANA,[Schneider]
application/vnd.ms-powerpoint @ppt,pps,pot :base64 'IANA,[Gill]
-application/vnd.ms-powerpoint.slide.macroEnabled.12 @pptm 'IANA,[Rae]
+application/vnd.ms-powerpoint.addin.macroEnabled.12 'IANA,[Rae]
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 'IANA,[Rae]
+application/vnd.ms-powerpoint.slide.macroEnabled.12 'IANA,[Rae]
application/vnd.ms-powerpoint.slideshow.macroEnabled.12 'IANA,[Rae]
application/vnd.ms-powerpoint.template.macroEnabled.12 @potm 'IANA,[Rae]
application/vnd.ms-project @mpp :base64 'IANA,[Gill]
application/vnd.ms-tnef :base64 'IANA,[Gill]
+application/vnd.ms-windows.printerpairing 'IANA,[Hutchings]
application/vnd.ms-wmdrm.lic-chlg-req 'IANA,[Lau]
application/vnd.ms-wmdrm.lic-resp 'IANA,[Lau]
application/vnd.ms-wmdrm.meter-chlg-req 'IANA,[Lau]
application/vnd.ms-wmdrm.meter-resp 'IANA,[Lau]
+application/vnd.ms-word.document.macroEnabled.12 'IANA,[Rae]
+application/vnd.ms-word.template.macroEnabled.12 'IANA,[Rae]
application/vnd.ms-works :base64 'IANA,[Gill]
application/vnd.ms-wpl @wpl :base64 'IANA,[Plastina]
application/vnd.ms-xpsdocument @xps :8bit 'IANA,[McGatha]
@@ -568,14 +615,16 @@
application/vnd.nervana @ent,entity,req,request,bkm,kcm 'IANA,[Judkins]
application/vnd.netfpx 'IANA,[Mutz]
application/vnd.neurolanguage.nlu 'IANA,[DuFeu]
+application/vnd.nintendo.nitro.rom 'IANA,[Andersson]
+application/vnd.nitf 'IANA,[Rogan]
application/vnd.noblenet-directory 'IANA,[Solomon]
application/vnd.noblenet-sealer 'IANA,[Solomon]
application/vnd.noblenet-web 'IANA,[Solomon]
application/vnd.nokia.catalogs 'IANA,[Nokia]
application/vnd.nokia.conml+wbxml 'IANA,[Nokia]
application/vnd.nokia.conml+xml 'IANA,[Nokia]
-application/vnd.nokia.iSDS-radio-presets 'IANA,[Nokia]
application/vnd.nokia.iptv.config+xml 'IANA,[Nokia]
+application/vnd.nokia.iSDS-radio-presets 'IANA,[Nokia]
application/vnd.nokia.landmark+wbxml 'IANA,[Nokia]
application/vnd.nokia.landmark+xml 'IANA,[Nokia]
application/vnd.nokia.landmarkcollection+xml 'IANA,[Nokia]
@@ -590,6 +639,10 @@
application/vnd.novadigm.EDM 'IANA,[Swenson]
application/vnd.novadigm.EDX 'IANA,[Swenson]
application/vnd.novadigm.EXT 'IANA,[Swenson]
+application/vnd.ntt-local.content-share 'IANA,[Taya]
+application/vnd.ntt-local.file-transfer 'IANA,[NTT-local]
+application/vnd.ntt-local.sip-ta_remote 'IANA,[NTT-local]
+application/vnd.ntt-local.sip-ta_tcp_stream 'IANA,[NTT-local]
application/vnd.oasis.opendocument.chart @odc 'IANA,[Oppermann]
application/vnd.oasis.opendocument.chart-template @odc 'IANA,[Oppermann]
application/vnd.oasis.opendocument.database @odb 'IANA,[Schubert],[Oasis OpenDocument TC=OASIS OpenDocumentTC]
@@ -639,6 +692,8 @@
application/vnd.oma.bcast.stkm 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
application/vnd.oma.cab-address-book+xml 'IANA,[Wang],[OMA]
application/vnd.oma.cab-pcc+xml 'IANA,[Wang],[OMA]
+application/vnd.oma.cab-subs-invite+xml 'IANA,[Wang],[OMA]
+application/vnd.oma.cab-user-prefs+xml 'IANA,[Wang],[OMA]
application/vnd.oma.dcd 'IANA,[Primo],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
application/vnd.oma.dcdc 'IANA,[Primo],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
application/vnd.oma.dd2+xml 'IANA,[Sato],[Open Mobile Alliance's BAC DLDRM Working Group]
@@ -673,16 +728,16 @@
application/vnd.openxmlformats-officedocument.presentationml.handoutMaster+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.presProps+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.presentation @pptx 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml 'IANA,[Murata]
+application/vnd.openxmlformats-officedocument.presentationml.presProps+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.slide 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.slide+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slideUpdateInfo+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.slideshow @ppsx 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml 'IANA,[Murata]
+application/vnd.openxmlformats-officedocument.presentationml.slideUpdateInfo+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.tags+xml 'IANA,[Murata]
application/vnd.openxmlformats-officedocument.presentationml.template @potx 'IANA,[Murata]
@@ -732,10 +787,12 @@
application/vnd.openxmlformats-package.core-properties+xml 'IANA,[Murata]
application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml 'IANA,[Murata]
application/vnd.openxmlformats-package.relationships+xml 'IANA,[Murata]
+application/vnd.orange.indata 'IANA,[CHATRAS_Bruno]
application/vnd.osa.netdeploy 'IANA,[Klos]
application/vnd.osgeo.mapguide.package 'IANA,[Birch]
application/vnd.osgi.bundle 'IANA,[Kriens]
application/vnd.osgi.dp 'IANA,[Kriens]
+application/vnd.osgi.subsystem 'IANA,[Kriens]
application/vnd.otps.ct-kip+xml 'IANA,[Nyström=Nystrom]
application/vnd.palm @prc,pdb,pqa,oprc :base64 'IANA,[Peacock]
application/vnd.paos.xml 'IANA,[Kemp]
@@ -761,6 +818,7 @@
application/vnd.pwg-multiplexed 'IANA,RFC3391
application/vnd.pwg-xhtml-print+xml 'IANA,[Wright]
application/vnd.qualcomm.brew-app-res 'IANA,[Forrester]
+application/vnd.Quark.QuarkXPress @qxd,qxt,qwd,qwt,qxl,qxb :8bit 'IANA,[Scheidler]
application/vnd.quobject-quoxdocument 'IANA,[Ludwig]
application/vnd.radisys.moml+xml 'IANA,RFC5707
application/vnd.radisys.msml+xml 'IANA,RFC5707
@@ -782,8 +840,10 @@
application/vnd.realvnc.bed 'IANA,[Reeves]
application/vnd.recordare.musicxml 'IANA,[Good]
application/vnd.recordare.musicxml+xml 'IANA,[Good]
+application/vnd.RenLearn.rlprint 'IANA,[Wick]
application/vnd.rig.cryptonote 'IANA,[Jibiki]
application/vnd.route66.link66+xml 'IANA,[Kikstra]
+application/vnd.rs-274x 'IANA,[Harding]
application/vnd.ruckus.download 'IANA,[Harris]
application/vnd.s3sms 'IANA,[Tarkkala]
application/vnd.sailingtracker.track 'IANA,[Vesalainen]
@@ -809,6 +869,8 @@
application/vnd.shana.informed.formtemplate 'IANA,[Selzler]
application/vnd.shana.informed.interchange 'IANA,[Selzler]
application/vnd.shana.informed.package 'IANA,[Selzler]
+application/vnd.SimTech-MindMapper 'IANA,[Koh]
+application/vnd.siren+json 'IANA,[Swiber]
application/vnd.smaf @mmf 'IANA,[Takahashi]
application/vnd.smart.notebook 'IANA,[Neitz]
application/vnd.smart.teacher 'IANA,[Boyle]
@@ -831,6 +893,10 @@
application/vnd.syncml.dm+wbxml 'IANA,[OMA-DM Work Group]
application/vnd.syncml.dm+xml 'IANA,[Rao],[OMA-DM Work Group]
application/vnd.syncml.dm.notification 'IANA,[Thompson],[OMA-DM Work Group]
+application/vnd.syncml.dmddf+wbxml 'IANA,[OMA-DM Work Group]
+application/vnd.syncml.dmddf+xml 'IANA,[OMA-DM Work Group]
+application/vnd.syncml.dmtnds+wbxml 'IANA,[OMA-DM Work Group]
+application/vnd.syncml.dmtnds+xml 'IANA,[OMA-DM Work Group]
application/vnd.syncml.ds.notification 'IANA,[OMA Data Synchronization Working Group]
application/vnd.tao.intent-module-archive 'IANA,[Shelton]
application/vnd.tmobile-livetv 'IANA,[Helin]
@@ -873,6 +939,7 @@
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]
@@ -885,6 +952,7 @@
application/vnd.wv.csp+wbxml @wv 'IANA,[Salmi]
application/vnd.wv.csp+xml :8bit 'IANA,[Ingimundarson]
application/vnd.wv.ssp+xml :8bit 'IANA,[Ingimundarson]
+application/vnd.xacml+json 'IANA,[Brossard]
application/vnd.xara 'IANA,[Matthewman]
application/vnd.xfdl 'IANA,[Manning]
application/vnd.xfdl.webform 'IANA,[Mansell]
@@ -917,6 +985,7 @@
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
@@ -938,3 +1007,4 @@
application/yang 'IANA,RFC6020
application/yin+xml 'IANA,RFC6020
application/zip @zip :base64 'IANA,[Lindner]
+application/zlib 'IANA,RFC6713
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/application.mac ruby-mime-types-1.25/lib/mime/types/application.mac
--- ruby-mime-types-1.17.2/lib/mime/types/application.mac 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/application.mac 2013-09-14 14:09:18.000000000 +0000
@@ -1,2 +1,3 @@
+mac:application/x-apple-diskimage @dmg
mac:application/x-mac @bin :base64
mac:application/x-macbase64 @bin :base64
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/application.nonstandard ruby-mime-types-1.25/lib/mime/types/application.nonstandard
--- ruby-mime-types-1.17.2/lib/mime/types/application.nonstandard 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/application.nonstandard 2013-09-14 14:09:18.000000000 +0000
@@ -1,5 +1,3 @@
-*application/SLA 'LTSW
-*application/STEP 'LTSW
*application/acad 'LTSW
*application/appledouble :base64
*application/clariscad 'LTSW
@@ -13,8 +11,14 @@
*application/powerpoint @ppt,pps,pot :base64 'LTSW
*application/pro_eng 'LTSW
*application/set 'LTSW
+*application/SLA 'LTSW
*application/solids 'LTSW
+*application/STEP 'LTSW
*application/vda 'LTSW
+*application/vnd.adobe.air-application-installer-package+zip @air :base64
+*application/vnd.android.package-archive @apk
+*application/vnd.ms-fontobject @eot
+*application/vnd.rn-realmedia @rm
*application/vnd.stardivision.calc @sdc
*application/vnd.stardivision.chart @sds
*application/vnd.stardivision.draw @sda
@@ -33,15 +37,14 @@
*application/vnd.sun.xml.writer.global @sxg
*application/vnd.sun.xml.writer.template @stw
*application/word @doc,dot 'LTSW
-application/x-SLA
-application/x-STEP
-application/x-VMSBACKUP @bck :base64
-application/x-Wingz @wz
+application/epub+zip @epub
+application/rss+xml @rss
application/x-bcpio @bcpio 'LTSW
application/x-bleeper @bleep :base64
application/x-bzip2 @bz2
application/x-cdlink @vcd
application/x-chess-pgn @pgn
+application/x-chrome-extension @crx
application/x-clariscad
application/x-compressed @z,Z :base64 'LTSW
application/x-cpio @cpio :base64 'LTSW
@@ -53,6 +56,8 @@
application/x-dvi @dvi :base64 'LTSW
application/x-dxf
application/x-excel
+application/x-font-opentype @otf :base64
+application/x-font-truetype @ttf :base64
application/x-fractals
application/x-futuresplash @spl
application/x-ghostview
@@ -62,9 +67,13 @@
application/x-hep @hep
application/x-html+ruby @rhtml :8bit
application/x-httpd-php @phtml,pht,php :8bit
+application/x-ibooks+zip @ibooks
application/x-ica @ica
application/x-ideas
application/x-imagemap @imagemap,imap :8bit
+application/x-iwork-keynote-sffkey @key
+application/x-iwork-numbers-sffnumbers @numbers
+application/x-iwork-pages-sffpages @pages
application/x-java-archive @jar 'LTSW
application/x-java-jnlp-file @jnlp 'LTSW
application/x-java-serialized-object @ser 'LTSW
@@ -76,11 +85,15 @@
application/x-maker @frm,maker,frame,fm,fb,book,fbdoc =use-instead:application/vnd.framemaker
application/x-mathematica-old
application/x-mif @mif 'LTSW
+application/x-mobipocket-ebook @mobi
+application/x-ms-wmd @wmd
+application/x-ms-wmz @wmz
application/x-msaccess @mda,mdb,mde,mdf
application/x-msdos-program @cmd,bat,com,exe :base64
application/x-msdownload @exe,com :base64
application/x-netcdf @nc,cdf
application/x-ns-proxy-autoconfig @pac
+application/x-opera-extension @oex
application/x-pagemaker @pm,pm5,pt5
application/x-perl @pl,pm :8bit
application/x-pgp
@@ -93,8 +106,10 @@
application/x-sh @sh :8bit 'LTSW
application/x-shar @shar :8bit 'LTSW
application/x-shockwave-flash @swf
+application/x-SLA
application/x-solids
application/x-spss @sav,sbs,sps,spo,spp
+application/x-STEP
application/x-stuffit @sit :base64 'LTSW
application/x-sv4cpio @sv4cpio :base64 'LTSW
application/x-sv4crc @sv4crc :base64 'LTSW
@@ -107,8 +122,11 @@
application/x-troff-me @me 'LTSW
application/x-troff-ms @ms 'LTSW
application/x-ustar @ustar :base64 'LTSW
+application/x-VMSBACKUP @bck :base64
application/x-wais-source @src 'LTSW
+application/x-web-app-manifest+json @webapp
+application/x-Wingz @wz
application/x-wordperfect6.1 @wp6
application/x-x509-ca-cert @crt :base64
-application/x-ms-wmz @wmz
-application/x-ms-wmd @wmd
+application/x-xpinstall @xpi
+application/x-7z-compressed @7z '{7zip=http://www.7-zip.org/7z.html}
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/application.obsolete ruby-mime-types-1.25/lib/mime/types/application.obsolete
--- ruby-mime-types-1.17.2/lib/mime/types/application.obsolete 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/application.obsolete 2013-09-14 14:09:18.000000000 +0000
@@ -1,5 +1,6 @@
!application/smil @smi,smil :8bit 'IANA,RFC4536 =use-instead:application/smil+xml
!application/vnd.arastra.swi 'IANA,[Fenner] =use-instead:application/vnd.aristanetworks.swi
+!application/vnd.geocube+xml :8bit 'IANA,[Pirsch]
!application/vnd.gmx 'IANA,[Sciberras]
!application/vnd.nokia.ncd+xml 'IANA,[Nokia] =use-instead:application/vnd.nokia.ncd
!application/x-123 @wk =use-instead:application/vnd.lotus-1-2-3
@@ -16,7 +17,6 @@
!application/x-wordperfect @wp =use-instead:application/vnd.wordperfect
!application/x-wordperfectd @wpd =use-instead:application/vnd.wordperfect
!application/xhtml-voice+xml 'IANA,{RFC-mccobb-xplusv-media-type-04.txt=https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&filename=draft-mccobb-xplusv-media-type}
-*!application/VMSBACKUP @bck :base64 =use-instead:application/x-VMSBACKUP
*!application/access @mdf,mda,mdb,mde =use-instead:application/x-msaccess
*!application/bleeper @bleep :base64 =use-instead:application/x-bleeper
*!application/cals1840 'LTSW =use-instead:application/cals-1840
@@ -32,6 +32,7 @@
*!application/quicktimeplayer @qtl =use-instead:application/x-quicktimeplayer
*!application/remote_printing 'LTSW =use-instead:application/remote-printing
*!application/toolbook @tbk =use-instead:application/x-toolbook
+*!application/VMSBACKUP @bck :base64 =use-instead:application/x-VMSBACKUP
*!application/vnd.ms-word.document.macroEnabled.12 @docm
*!application/vnd.ms-word.template.macroEnabled.12 @dotm
*!application/wordperfect @wp =use-instead:application/vnd.wordperfect
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/audio ruby-mime-types-1.25/lib/mime/types/audio
--- ruby-mime-types-1.17.2/lib/mime/types/audio 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/audio 2013-09-14 14:09:18.000000000 +0000
@@ -2,16 +2,29 @@
audio/32kadpcm 'IANA,RFC3802,RFC2421
audio/3gpp 'IANA,RFC3839,RFC6381
audio/3gpp2 'IANA,RFC4393,RFC6381
+audio/ac3 'IANA,RFC4184
audio/AMR @amr :base64 'RFC4867
audio/AMR-WB @awb :base64 'RFC4867
+audio/amr-wb+ 'IANA,RFC4352
+audio/asc 'IANA,RFC6295
audio/ATRAC-ADVANCED-LOSSLESS 'IANA,RFC5584
audio/ATRAC-X 'IANA,RFC5584
audio/ATRAC3 'IANA,RFC5584
+audio/basic @au,snd :base64 'IANA,RFC2045,RFC2046
audio/BV16 'IANA,RFC4298
audio/BV32 'IANA,RFC4298
+audio/clearmode 'IANA,RFC4040
audio/CN 'IANA,RFC3389
audio/DAT12 'IANA,RFC3190
+audio/dls 'IANA,RFC4613
+audio/dsr-es201108 'IANA,RFC3557
+audio/dsr-es202050 'IANA,RFC4060
+audio/dsr-es202211 'IANA,RFC4060
+audio/dsr-es202212 'IANA,RFC4060
+audio/DV 'IANA,RFC6469
audio/DVI4 'IANA,RFC4856
+audio/eac3 'IANA,RFC4598
+audio/encaprtp 'IANA,RFC6849
audio/EVRC @evc 'IANA,RFC4788
audio/EVRC-QCP 'IANA,RFC3625
audio/EVRC0 'IANA,RFC4788
@@ -19,10 +32,15 @@
audio/EVRCB 'IANA,RFC5188
audio/EVRCB0 'IANA,RFC5188
audio/EVRCB1 'IANA,RFC4788
+audio/EVRCNW 'IANA,RFC6884
+audio/EVRCNW0 'IANA,RFC6884
+audio/EVRCNW1 'IANA,RFC6884
audio/EVRCWB 'IANA,RFC5188
audio/EVRCWB0 'IANA,RFC5188
audio/EVRCWB1 'IANA,RFC5188
-audio/G719 'IANA,RFC5404
+audio/example 'IANA,RFC4735
+audio/fwdred 'IANA,RFC6354
+audio/G719 'IANA,RFC5404,{Errata3245=http://www.rfc-editor.org/errata_search.php?rfc=5404&eid=3245}
audio/G722 'IANA,RFC4856
audio/G7221 'IANA,RFC5577
audio/G723 'IANA,RFC4856
@@ -38,62 +56,51 @@
audio/GSM 'IANA,RFC4856
audio/GSM-EFR 'IANA,RFC4856
audio/GSM-HR-08 'IANA,RFC5993
+audio/iLBC 'IANA,RFC3952
+audio/ip-mr_v2.5 'IANA,RFC6262
audio/L16 @l16 'IANA,RFC4856
audio/L20 'IANA,RFC3190
audio/L24 'IANA,RFC3190
audio/L8 'IANA,RFC4856
audio/LPC 'IANA,RFC4856
-audio/MP4A-LATM 'IANA,RFC6416
+audio/mobile-xmf 'IANA,RFC4723
+audio/mp4 @mp4,mpg4,f4a,f4b 'IANA,RFC4337,{Adobe=http://www.kaourantin.net/2007/10/new-file-extensions-and-mime-types.html}
+audio/MP4A-LATM @m4a 'IANA,RFC6416
audio/MPA 'IANA,RFC3555
+audio/mpa-robust 'IANA,RFC5219
+audio/mpeg @mpga,mp2,mp3 :base64 'IANA,RFC3003
+audio/mpeg4-generic 'IANA,RFC3640,RFC5691,RFC6295
+audio/ogg @ogg 'IANA,RFC5334
+audio/parityfec 'IANA,RFC5109
audio/PCMA 'IANA,RFC4856
audio/PCMA-WB 'IANA,RFC5391
audio/PCMU 'IANA,RFC4856
audio/PCMU-WB 'IANA,RFC5391
+audio/prs.sid 'IANA,[Walleij]
audio/QCELP 'IANA,RFC3555,RFC3625
+audio/raptorfec 'IANA,RFC6682
audio/RED 'IANA,RFC3555
-audio/SMV @smv 'IANA,RFC3558
-audio/SMV-QCP 'IANA,RFC3625
-audio/SMV0 'IANA,RFC3558
-audio/UEMCLIP 'IANA,RFC5686
-audio/VDVI 'IANA,RFC4856
-audio/VMR-WB 'IANA,RFC4348,RFC4424
-audio/ac3 'IANA,RFC4184
-audio/amr-wb+ 'IANA,RFC4352
-audio/asc 'IANA,RFC6295
-audio/basic @au,snd :base64 'IANA,RFC2045,RFC2046
-audio/clearmode 'IANA,RFC4040
-audio/dls 'IANA,RFC4613
-audio/dsr-es201108 'IANA,RFC3557
-audio/dsr-es202050 'IANA,RFC4060
-audio/dsr-es202211 'IANA,RFC4060
-audio/dsr-es202212 'IANA,RFC4060
-audio/eac3 'IANA,RFC4598
-audio/example 'IANA,RFC4735
-audio/fwdred 'IANA,RFC6354
-audio/iLBC 'IANA,RFC3952
-audio/ip-mr_v2.5 'IANA,RFC6262
-audio/mobile-xmf 'IANA,RFC4723
-audio/mp4 @mp4,mpg4 'IANA,RFC4337
-audio/mpa-robust 'IANA,RFC5219
-audio/mpeg @mpga,mp2,mp3 :base64 'IANA,RFC3003
-audio/mpeg4-generic 'IANA,RFC3640,RFC5691,RFC6295
-audio/ogg 'IANA,RFC5334
-audio/parityfec 'IANA,RFC5109
-audio/prs.sid 'IANA,[Walleij]
audio/rtp-enc-aescm128 'IANA,[3GPP]
audio/rtp-midi 'IANA,RFC6295
+audio/rtploopback 'IANA,RFC6849
audio/rtx 'IANA,RFC4588
+audio/SMV @smv 'IANA,RFC3558
+audio/SMV-QCP 'IANA,RFC3625
+audio/SMV0 'IANA,RFC3558
audio/sp-midi 'IANA,[Kosonen],[T. White=T.White]
audio/speex 'IANA,RFC5574
audio/t140c 'IANA,RFC4351
audio/t38 'IANA,RFC4612
audio/telephone-event 'IANA,RFC4733
audio/tone 'IANA,RFC4733
+audio/UEMCLIP 'IANA,RFC5686
audio/ulpfec 'IANA,RFC5109
+audio/VDVI 'IANA,RFC4856
+audio/VMR-WB 'IANA,RFC4348,RFC4424
audio/vnd.3gpp.iufp 'IANA,[Belling]
audio/vnd.4SB 'IANA,[De Jaham]
-audio/vnd.CELP 'IANA,[De Jaham]
audio/vnd.audiokoz 'IANA,[DeBarros]
+audio/vnd.CELP 'IANA,[De Jaham]
audio/vnd.cisco.nse 'IANA,[Kumar]
audio/vnd.cmles.radio-events 'IANA,[Goulet]
audio/vnd.cns.anp1 'IANA,[McLaughlin]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/audio.nonstandard ruby-mime-types-1.25/lib/mime/types/audio.nonstandard
--- ruby-mime-types-1.17.2/lib/mime/types/audio.nonstandard 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/audio.nonstandard 2013-09-14 14:09:18.000000000 +0000
@@ -1,10 +1,11 @@
-audio/x-aiff @aif,aifc,aiff :base64
audio/x-aac @aac
+audio/x-aiff @aif,aifc,aiff :base64
audio/x-midi @mid,midi,kar :base64
-audio/x-pn-realaudio @rm,ram :base64
+audio/x-ms-wax @wax
+audio/x-ms-wma @wma
+audio/x-ms-wmv @wmv
+audio/x-pn-realaudio @ra,ram :base64
audio/x-pn-realaudio-plugin @rpm
audio/x-realaudio @ra :base64
audio/x-wav @wav :base64
-audio/x-ms-wma @wma
-audio/x-ms-wax @wax
-audio/x-ms-wmv @wmv
+*audio/webm @webm '{WebM=http://www.webmproject.org/code/specs/container/}
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/image ruby-mime-types-1.25/lib/mime/types/image
--- ruby-mime-types-1.17.2/lib/mime/types/image 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/image 2013-09-14 14:09:18.000000000 +0000
@@ -13,11 +13,13 @@
image/png @png :base64 'IANA,[Randers-Pehrson]
image/prs.btif 'IANA,[Simon]
image/prs.pti 'IANA,[Laun]
-image/svg+xml @svg :8bit 'IANA,[W3C]
+image/pwg-raster 'IANA,[Sweet]
+image/svg+xml @svg,svgz :8bit 'IANA,[W3C]
image/t38 'IANA,RFC3362
image/tiff @tiff,tif :base64 'IANA,RFC2302
image/tiff-fx 'IANA,RFC3950
-image/vnd.adobe.photoshop 'IANA,[Scarborough]
+image/vnd.adobe.photoshop @psd 'IANA,[Scarborough]
+image/vnd.airzip.accelerator.azv 'IANA,[Clueit]
image/vnd.cns.inf2 'IANA,[McLaughlin]
image/vnd.dece.graphic 'IANA,[Dolan]
image/vnd.djvu @djvu,djv 'IANA,[Bottou]
@@ -41,3 +43,4 @@
image/vnd.svf 'IANA,[Moline]
image/vnd.wap.wbmp 'IANA,[Stark]
image/vnd.xiff 'IANA,[S.Martin]
+image/webp @webp
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/image.nonstandard ruby-mime-types-1.25/lib/mime/types/image.nonstandard
--- ruby-mime-types-1.17.2/lib/mime/types/image.nonstandard 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/image.nonstandard 2013-09-14 14:09:18.000000000 +0000
@@ -1,6 +1,8 @@
*image/pjpeg :base64 =Fixes a bug with IE6 and progressive JPEGs
image/x-bmp @bmp
image/x-cmu-raster @ras
+image/x-compressed-xcf @xcfbz2,xcfgz =see-also:image/x-xcf
+image/x-hasselblad-3fr @3fr :base64
image/x-paintshoppro @psp,pspimage :base64
image/x-pict
image/x-portable-anymap @pnm :base64
@@ -13,5 +15,6 @@
image/x-win-bmp
image/x-xbitmap @xbm :7bit
image/x-xbm @xbm :7bit
+image/x-xcf @xcf '{XCF=http://git.gnome.org/browse/gimp/tree/devel-docs/xcf.txt}
image/x-xpixmap @xpm :8bit
image/x-xwindowdump @xwd :base64
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/message ruby-mime-types-1.25/lib/mime/types/message
--- ruby-mime-types-1.17.2/lib/mime/types/message 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/message 2013-09-14 14:09:18.000000000 +0000
@@ -4,10 +4,10 @@
message/example 'IANA,RFC4735
message/external-body :8bit 'IANA,RFC2045,RFC2046
message/feedback-report 'IANA,RFC5965
-message/global 'IANA,RFC5335
-message/global-delivery-status 'IANA,RFC5337
-message/global-disposition-notification 'IANA,RFC5337
-message/global-headers 'IANA,RFC5337
+message/global 'IANA,RFC6532
+message/global-delivery-status 'IANA,RFC6533
+message/global-disposition-notification 'IANA,RFC6533
+message/global-headers 'IANA,RFC6533
message/http 'IANA,RFC2616
message/imdn+xml 'IANA,RFC5438
message/partial :8bit 'IANA,RFC2045,RFC2046
@@ -16,4 +16,3 @@
message/sip 'IANA,RFC3261
message/sipfrag 'IANA,RFC3420
message/tracking-status 'IANA,RFC3886
-message/vnd.si.simp 'IANA,[Parks Young=ParksYoung]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/message.obsolete ruby-mime-types-1.25/lib/mime/types/message.obsolete
--- ruby-mime-types-1.17.2/lib/mime/types/message.obsolete 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/message.obsolete 2013-09-14 14:09:18.000000000 +0000
@@ -1 +1,2 @@
!message/news :8bit 'IANA,RFC1036,[H.Spencer]
+!message/vnd.si.simp 'IANA,[Parks Young=ParksYoung]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/model ruby-mime-types-1.25/lib/mime/types/model
--- ruby-mime-types-1.17.2/lib/mime/types/model 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/model 2013-09-14 14:09:18.000000000 +0000
@@ -1,8 +1,8 @@
model/example 'IANA,RFC4735
model/iges @igs,iges 'IANA,[Parks]
model/mesh @msh,mesh,silo 'IANA,RFC2077
-model/vnd.dwf 'IANA,[Pratt]
model/vnd.collada+xml 'IANA,[Riordon]
+model/vnd.dwf 'IANA,[Pratt]
model/vnd.flatland.3dml 'IANA,[Powers]
model/vnd.gdl 'IANA,[Babits]
model/vnd.gs-gdl 'IANA,[Babits]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/multipart ruby-mime-types-1.25/lib/mime/types/multipart
--- ruby-mime-types-1.17.2/lib/mime/types/multipart 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/multipart 2013-09-14 14:09:18.000000000 +0000
@@ -9,6 +9,6 @@
multipart/mixed :8bit 'IANA,RFC2045,RFC2046
multipart/parallel :8bit 'IANA,RFC2045,RFC2046
multipart/related 'IANA,RFC2387
-multipart/report 'IANA,RFC3462
+multipart/report 'IANA,RFC6522
multipart/signed 'IANA,RFC1847
multipart/voice-message 'IANA,RFC2421,RFC2423
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/multipart.obsolete ruby-mime-types-1.25/lib/mime/types/multipart.obsolete
--- ruby-mime-types-1.17.2/lib/mime/types/multipart.obsolete 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/multipart.obsolete 2013-09-14 14:09:18.000000000 +0000
@@ -1,7 +1,7 @@
+!multipart/x-parallel =use-instead:multipart/parallel
multipart/x-gzip
multipart/x-mixed-replace
multipart/x-tar
multipart/x-ustar
multipart/x-www-form-urlencoded
multipart/x-zip
-!multipart/x-parallel =use-instead:multipart/parallel
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/text ruby-mime-types-1.25/lib/mime/types/text
--- ruby-mime-types-1.17.2/lib/mime/types/text 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/text 2013-09-14 14:09:18.000000000 +0000
@@ -1,22 +1,29 @@
text/1d-interleaved-parityfec 'IANA,RFC6015
-text/RED 'IANA,RFC4102
text/calendar 'IANA,RFC5545
text/css @css :8bit 'IANA,RFC2318
text/csv @csv :8bit 'IANA,RFC4180
text/dns 'IANA,RFC4027
+text/encaprtp 'IANA,RFC6849
text/enriched 'IANA,RFC1896
text/example 'IANA,RFC4735
text/fwdred 'IANA,RFC6354
-text/html @html,htm,htmlx,shtml,htx :8bit 'IANA,RFC2854
+text/grammar-ref-list 'IANA,RFC6787
+text/html @html,htm,htmlx,shtml,htx :8bit 'IANA,[Michael Smith=MSmith],[W3C]
+text/jcr-cnd 'IANA,[Piegaze]
+text/mizar 'IANA,[Jesse Alama=Jesse_Alama]
text/n3 'IANA,[Prud'hommeaux=Prudhommeaux],[W3C]
text/parityfec 'IANA,RFC5109
text/plain @txt,asc,c,cc,h,hh,cpp,hpp,dat,hlp 'IANA,RFC2046,RFC3676,RFC5147
+text/provenance-notation 'IANA,[Herman],[W3C]
text/prs.fallenstein.rst @rst 'IANA,[Fallenstein]
text/prs.lines.tag 'IANA,[Lines]
-text/rfc822-headers 'IANA,RFC3462
+text/raptorfec 'IANA,RFC6682
+text/RED 'IANA,RFC4102
+text/rfc822-headers 'IANA,RFC6522
text/richtext @rtx :8bit 'IANA,RFC2045,RFC2046
text/rtf @rtf :8bit 'IANA,[Lindner]
text/rtp-enc-aescm128 'IANA,[3GPP]
+text/rtploopback 'IANA,RFC6849
text/rtx 'IANA,RFC4588
text/sgml @sgml,sgm 'IANA,RFC1874
text/t140 'IANA,RFC4103
@@ -26,11 +33,10 @@
text/ulpfec 'IANA,RFC5109
text/uri-list 'IANA,RFC2483
text/vcard 'IANA,RFC6350
-text/vnd.DMClientScript 'IANA,[Bradley]
-text/vnd.IPTC.NITF 'IANA,[IPTC]
-text/vnd.IPTC.NewsML 'IANA,[IPTC]
text/vnd.abc 'IANA,[Allen]
text/vnd.curl 'IANA,[Byrnes]
+text/vnd.debian.copyright 'IANA,[Plessy]
+text/vnd.DMClientScript 'IANA,[Bradley]
text/vnd.dvb.subtitle 'IANA,[Siebert],[Lagally]
text/vnd.esmertec.theme-descriptor 'IANA,[Eilemann]
text/vnd.fly 'IANA,[Gurney]
@@ -38,12 +44,13 @@
text/vnd.graphviz 'IANA,[Ellson]
text/vnd.in3d.3dml 'IANA,[Powers]
text/vnd.in3d.spot 'IANA,[Powers]
+text/vnd.IPTC.NewsML 'IANA,[IPTC]
+text/vnd.IPTC.NITF 'IANA,[IPTC]
text/vnd.latex-z 'IANA,[Lubos]
text/vnd.motorola.reflex 'IANA,[Patton]
text/vnd.ms-mediapackage 'IANA,[Nelson]
text/vnd.net2phone.commcenter.command @ccc 'IANA,[Xie]
text/vnd.radisys.msml-basic-layout 'IANA,RFC5707
-text/vnd.si.uricatalogue 'IANA,[Parks Young=ParksYoung]
text/vnd.sun.j2me.app-descriptor @jad :8bit 'IANA,[G.Adams]
text/vnd.trolltech.linguist 'IANA,[D.Lambert]
text/vnd.wap.si @si 'IANA,[WAP-Forum]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/text.nonstandard ruby-mime-types-1.25/lib/mime/types/text.nonstandard
--- ruby-mime-types-1.17.2/lib/mime/types/text.nonstandard 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/text.nonstandard 2013-09-14 14:09:18.000000000 +0000
@@ -1,3 +1,5 @@
+text/cache-manifest @appcache,manifest
+text/x-coffescript @coffee :8bit
text/x-component @htc :8bit
text/x-setext @etx
text/x-vcalendar @vcs :8bit
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/text.obsolete ruby-mime-types-1.25/lib/mime/types/text.obsolete
--- ruby-mime-types-1.17.2/lib/mime/types/text.obsolete 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/text.obsolete 2013-09-14 14:09:18.000000000 +0000
@@ -1,7 +1,8 @@
!text/directory 'IANA,RFC2425,RFC6350
!text/ecmascript 'IANA,RFC4329
-!text/javascript 'IANA,RFC4329
+!text/javascript @js 'IANA,RFC4329
!text/x-rtf @rtf :8bit =use-instead:text/rtf
!text/x-vnd.flatland.3dml =use-instead:model/vnd.flatland.3dml
*!text/comma-separated-values @csv :8bit =use-instead:text/csv
*!text/vnd.flatland.3dml =use-instead:model/vnd.flatland.3dml
+!text/vnd.si.uricatalogue 'IANA,[Parks Young=ParksYoung]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/video ruby-mime-types-1.25/lib/mime/types/video
--- ruby-mime-types-1.17.2/lib/mime/types/video 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/video 2013-09-14 14:09:18.000000000 +0000
@@ -1,11 +1,13 @@
video/1d-interleaved-parityfec 'IANA,RFC6015
video/3gpp @3gp,3gpp 'IANA,RFC3839,RFC6381
video/3gpp-tt 'IANA,RFC4396
-video/3gpp2 'IANA,RFC4393,RFC6381
+video/3gpp2 @3g2,3gpp2 'IANA,RFC4393,RFC6381
video/BMPEG 'IANA,RFC3555
video/BT656 'IANA,RFC3555
video/CelB 'IANA,RFC3555
-video/DV 'IANA,RFC3189
+video/DV 'IANA,RFC6469
+video/encaprtp 'IANA,RFC6849
+video/example 'IANA,RFC4735
video/H261 'IANA,RFC4587
video/H263 'IANA,RFC3555
video/H263-1998 'IANA,RFC4629
@@ -14,26 +16,27 @@
video/H264-RCDO 'IANA,RFC6185
video/H264-SVC 'IANA,RFC6190
video/JPEG 'IANA,RFC3555
+video/jpeg2000 'IANA,RFC5371,RFC5372
video/MJ2 @mj2,mjp2 'IANA,RFC3745
video/MP1S 'IANA,RFC3555
video/MP2P 'IANA,RFC3555
-video/MP2T 'IANA,RFC3555
+video/MP2T @ts 'IANA,RFC3555
+video/mp4 @mp4,mpg4,f4v,f4p 'IANA,RFC4337,RFC6381,{Adobe=http://www.kaourantin.net/2007/10/new-file-extensions-and-mime-types.html}
video/MP4V-ES 'IANA,RFC6416
-video/MPV 'IANA,RFC3555
-video/SMPTE292M 'IANA,RFC3497
-video/example 'IANA,RFC4735
-video/jpeg2000 'IANA,RFC5371,RFC5372
-video/mp4 @mp4,mpg4 'IANA,RFC4337,RFC6381
-video/mpeg @mp2,mpe,mp3g,mpg :base64 'IANA,RFC2045,RFC2046
+video/mpeg @mp2,mp3g,mpe,mpeg,mpg :base64 'IANA,RFC2045,RFC2046
video/mpeg4-generic 'IANA,RFC3640
+video/MPV 'IANA,RFC3555
video/nv 'IANA,RFC4856
-video/ogg @ogv 'IANA,RFC5334
+video/ogg @ogg,ogv 'IANA,RFC5334
video/parityfec 'IANA,RFC5109
video/pointer 'IANA,RFC2862
-video/quicktime @qt,mov :base64 'IANA,[Lindner]
+video/quicktime @qt,mov :base64 'IANA,RFC6381,[Lindner]
+video/raptorfec 'IANA,RFC6682
video/raw 'IANA,RFC4175
video/rtp-enc-aescm128 'IANA,[3GPP]
+video/rtploopback 'IANA,RFC6849
video/rtx 'IANA,RFC4588
+video/SMPTE292M 'IANA,RFC3497
video/ulpfec 'IANA,RFC5109
video/vc1 'IANA,RFC4425
video/vnd.CCTV 'IANA,[Rottmann]
@@ -44,6 +47,8 @@
video/vnd.dece.sd 'IANA,[Dolan]
video/vnd.dece.video 'IANA,[Dolan]
video/vnd.directv.mpeg 'IANA,[Zerbe]
+video/vnd.directv.mpeg-tts 'IANA,[Zerbe]
+video/vnd.dlna.mpeg-tts 'IANA,[Heredia]
video/vnd.dvb.file 'IANA,[Siebert],[Murray]
video/vnd.fvt 'IANA,[Fuldseth]
video/vnd.hns.video 'IANA,[Swaminathan]
@@ -59,7 +64,9 @@
video/vnd.ms-playready.media.pyv 'IANA,[DiAcetis]
video/vnd.nokia.interleaved-multimedia @nim 'IANA,[Kangaslampi]
video/vnd.nokia.videovoip 'IANA,[Nokia]
-video/vnd.objectvideo @mp4 'IANA,[Clark]
+video/vnd.objectvideo @mp4,m4v 'IANA,[Clark]
+video/vnd.radgamettools.bink 'IANA,[Andersson]
+video/vnd.radgamettools.smacker 'IANA,[Andersson]
video/vnd.sealed.mpeg1 @s11 'IANA,[Petersen]
video/vnd.sealed.mpeg4 @smpg,s14 'IANA,[Petersen]
video/vnd.sealed.swf @sswf,ssw 'IANA,[Petersen]
diff -Nru ruby-mime-types-1.17.2/lib/mime/types/video.nonstandard ruby-mime-types-1.25/lib/mime/types/video.nonstandard
--- ruby-mime-types-1.17.2/lib/mime/types/video.nonstandard 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types/video.nonstandard 2013-09-14 14:09:18.000000000 +0000
@@ -1,7 +1,11 @@
video/x-dl @dl :base64
+video/x-dv @dv
video/x-fli @fli :base64
video/x-flv @flv :base64
video/x-gl @gl :base64
+video/x-ivf @ivf
+video/x-matroska @mkv
+video/x-motion-jpeg @mjpg,mjpeg
video/x-ms-asf @asf,asx
video/x-ms-wm @wm
video/x-ms-wmv @wmv
@@ -9,3 +13,4 @@
video/x-ms-wvx @wvx
video/x-msvideo @avi :base64
video/x-sgi-movie @movie :base64
+*video/webm @webm '{WebM=http://www.webmproject.org/code/specs/container/}
diff -Nru ruby-mime-types-1.17.2/lib/mime/types.rb ruby-mime-types-1.25/lib/mime/types.rb
--- ruby-mime-types-1.17.2/lib/mime/types.rb 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime/types.rb 2013-09-14 14:09:18.000000000 +0000
@@ -11,20 +11,29 @@
# == Usage
# require 'mime/types'
#
- # plaintext = MIME::Types['text/plain']
- # print plaintext.media_type # => 'text'
- # print plaintext.sub_type # => 'plain'
- #
- # puts plaintext.extensions.join(" ") # => 'asc txt c cc h hh cpp'
- #
- # puts plaintext.encoding # => 8bit
- # puts plaintext.binary? # => false
- # puts plaintext.ascii? # => true
- # puts plaintext == 'text/plain' # => true
+ # plaintext = MIME::Types['text/plain'].first
+ # # returns [text/plain, text/plain]
+ # text = plaintext.first
+ # print text.media_type # => 'text'
+ # print text.sub_type # => 'plain'
+ #
+ # puts text.extensions.join(" ") # => 'asc txt c cc h hh cpp'
+ #
+ # puts text.encoding # => 8bit
+ # puts text.binary? # => false
+ # puts text.ascii? # => true
+ # puts text == 'text/plain' # => true
# puts MIME::Type.simplified('x-appl/x-zip') # => 'appl/zip'
#
+ # puts MIME::Types.any? { |type|
+ # type.content_type == 'text/plain'
+ # } # => true
+ # puts MIME::Types.all?(&:registered?)
+ # # => false
+ #
class Type
- VERSION = '1.17.2'
+ # The released version of Ruby MIME::Types
+ VERSION = '1.25'
include Comparable
@@ -44,7 +53,7 @@
LTSW_URL = "http://www.ltsw.se/knbase/internet/%s.htp"
CONTACT_URL = "http://www.iana.org/assignments/contact-people.htm#%s"
- # Returns +true+ if the simplified type matches the current
+ # Returns +true+ if the simplified type matches the current
def like?(other)
if other.respond_to?(:simplified)
@simplified == other.simplified
@@ -73,39 +82,35 @@
#
# 1. self.simplified <=> other.simplified (ensures that we
# don't try to compare different types)
- # 2. IANA-registered definitions > other definitions.
- # 3. Generic definitions > platform definitions.
- # 3. Complete definitions > incomplete definitions.
- # 4. Current definitions > obsolete definitions.
- # 5. Obselete with use-instead references > obsolete without.
+ # 2. IANA-registered definitions < other definitions.
+ # 3. Generic definitions < platform definitions.
+ # 3. Complete definitions < incomplete definitions.
+ # 4. Current definitions < obsolete definitions.
+ # 5. Obselete with use-instead references < obsolete without.
# 6. Obsolete use-instead definitions are compared.
def priority_compare(other)
pc = simplified <=> other.simplified
- if pc.zero? and registered? != other.registered?
- pc = registered? ? -1 : 1
- end
-
- if pc.zero? and platform? != other.platform?
- pc = platform? ? 1 : -1
- end
-
- if pc.zero? and complete? != other.complete?
- pc = complete? ? -1 : 1
- end
-
- if pc.zero? and obsolete? != other.obsolete?
- pc = obsolete? ? 1 : -1
- end
-
- if pc.zero? and obsolete? and (use_instead != other.use_instead)
- pc = if use_instead.nil?
- -1
- elsif other.use_instead.nil?
- 1
- else
- use_instead <=> other.use_instead
+ if pc.zero?
+ pc = if registered? != other.registered?
+ registered? ? -1 : 1 # registered < unregistered
+ elsif platform? != other.platform?
+ platform? ? 1 : -1 # generic < platform
+ elsif complete? != other.complete?
+ pc = complete? ? -1 : 1 # complete < incomplete
+ elsif obsolete? != other.obsolete?
+ pc = obsolete? ? 1 : -1 # current < obsolete
end
+
+ if pc.zero? and obsolete? and (use_instead != other.use_instead)
+ pc = if use_instead.nil?
+ -1
+ elsif other.use_instead.nil?
+ 1
+ else
+ use_instead <=> other.use_instead
+ end
+ end
end
pc
@@ -138,7 +143,7 @@
# x-chemical/x-pdb => pdb
attr_reader :sub_type
# Returns the media type of the unmodified MIME type.
- #
+ #
# text/plain => plain
# x-chemical/x-pdb => x-pdb
attr_reader :raw_sub_type
@@ -185,7 +190,7 @@
# The regexp for the operating system that this MIME::Type is specific
# to.
attr_accessor :system
- remove_method :system= ;
+ remove_method :system= ;
def system=(os) #:nodoc:
if os.nil? or os.kind_of?(Regexp)
@system = os
@@ -269,7 +274,7 @@
DRAFT_URL % $1
when %r{^LTSW$}
LTSW_URL % @media_type
- when %r<^\{([^=]+)=([^\]]+)\}>
+ when %r{^\{([^=]+)=([^\}]+)\}}
[$1, $2]
when %r{^\[([^=]+)=([^\]]+)\]}
[$1, CONTACT_URL % $2]
@@ -316,23 +321,17 @@
# end
def from_array(*args) #:yields MIME::Type.new:
# Dereferences the array one level, if necessary.
- args = args[0] if args[0].kind_of?(Array)
+ args = args.first if args.first.kind_of? Array
- if args.size.between?(1, 8)
- m = MIME::Type.new(args[0]) do |t|
- t.extensions = args[1] if args.size > 1
- t.encoding = args[2] if args.size > 2
- t.system = args[3] if args.size > 3
- t.obsolete = args[4] if args.size > 4
- t.docs = args[5] if args.size > 5
- t.url = args[6] if args.size > 6
- t.registered = args[7] if args.size > 7
- end
- yield m if block_given?
- else
+ unless args.size.between?(1, 8)
raise ArgumentError, "Array provided must contain between one and eight elements."
end
- m
+
+ MIME::Type.new(args.shift) do |t|
+ t.extensions, t.encoding, t.system, t.obsolete, t.docs, t.url,
+ t.registered = *args
+ yield t if block_given?
+ end
end
# Creates a MIME::Type from a hash. Keys are case-insensitive,
@@ -359,11 +358,11 @@
# end
def from_hash(hash) #:yields MIME::Type.new:
type = {}
- hash.each_pair do |k, v|
+ hash.each_pair do |k, v|
type[k.to_s.tr('A-Z', 'a-z').gsub(/-/, '_').to_sym] = v
end
- m = MIME::Type.new(type[:content_type]) do |t|
+ MIME::Type.new(type[:content_type]) do |t|
t.extensions = type[:extensions]
t.encoding = type[:content_transfer_encoding]
t.system = type[:system]
@@ -371,10 +370,9 @@
t.docs = type[:docs]
t.url = type[:url]
t.registered = type[:registered]
- end
- yield m if block_given?
- m
+ yield t if block_given?
+ end
end
# Essentially a copy constructor.
@@ -389,7 +387,7 @@
# t.encoding = plaintext.encoding.dup
# end
def from_mime_type(mime_type) #:yields the new MIME::Type:
- m = MIME::Type.new(mime_type.content_type.dup) do |t|
+ MIME::Type.new(mime_type.content_type.dup) do |t|
t.extensions = mime_type.extensions.map { |e| e.dup }
t.url = mime_type.url && mime_type.url.map { |e| e.dup }
@@ -400,10 +398,9 @@
t.registered = mime_type.registered?
mime_type.docs && t.docs = mime_type.docs.dup
-
- end
- yield m if block_given?
+ yield t if block_given?
+ end
end
end
@@ -560,32 +557,39 @@
# ftp://ftp.iana.org/assignments/media-types with some unofficial types
# added from the the collection at
# http://www.ltsw.se/knbase/internet/mime.htp
- #
- # This is originally based on Perl MIME::Types by Mark Overmeer.
- #
- # = Author
- # Copyright:: Copyright (c) 2002 - 2009 by Austin Ziegler
- #
- # Version:: 1.17.2
- # Based On:: Perl
- # MIME::Types[http://search.cpan.org/author/MARKOV/MIME-Types-1.27/MIME/Types.pm],
- # Copyright (c) 2001 - 2009 by Mark Overmeer
- # .
- # Licence:: Ruby's, Perl Artistic, or GPL version 2 (or later)
- # See Also:: http://www.iana.org/assignments/media-types/
- # http://www.ltsw.se/knbase/internet/mime.htp
- #
class Types
# The released version of Ruby MIME::Types
- VERSION = '1.17.2'
+ VERSION = MIME::Type::VERSION
+ DATA_VERSION = (VERSION.to_f * 100).to_i
- # The data version.
+ # The data version.
attr_reader :data_version
- def initialize(data_version = nil)
- @type_variants = Hash.new { |h, k| h[k] = [] }
- @extension_index = Hash.new { |h, k| h[k] = [] }
- @data_version = data_version
+ class HashWithArrayDefault < Hash # :nodoc:
+ def initialize
+ super { |h, k| h[k] = [] }
+ end
+
+ def marshal_dump
+ {}.merge(self)
+ end
+
+ def marshal_load(hash)
+ self.merge!(hash)
+ end
+ end
+
+ class CacheContainer # :nodoc:
+ attr_reader :version, :data
+ def initialize(version, data)
+ @version, @data = version, data
+ end
+ end
+
+ def initialize(data_version = DATA_VERSION)
+ @type_variants = HashWithArrayDefault.new
+ @extension_index = HashWithArrayDefault.new
+ @data_version = data_version
end
def add_type_variant(mime_type) #:nodoc:
@@ -600,7 +604,18 @@
@type_variants.values.flatten
end
- @__types__ = self.new(VERSION)
+ # Returns the number of known types. A shortcut of MIME::Types[//].size.
+ # (Keep in mind that this is memory intensive, cache the result to spare
+ # resources)
+ def count
+ defined_types.size
+ end
+
+ def each
+ defined_types.each { |t| yield t }
+ end
+
+ @__types__ = nil
# Returns a list of MIME::Type objects, which may be empty. The optional
# flag parameters are :complete (finds only complete MIME::Type objects)
@@ -629,32 +644,28 @@
# 6. Obsolete definitions use-instead clauses are compared.
# 7. Sort on name.
def [](type_id, flags = {})
- if type_id.kind_of?(Regexp)
- matches = []
- @type_variants.each_key do |k|
- matches << @type_variants[k] if k =~ type_id
- end
- matches.flatten!
- elsif type_id.kind_of?(MIME::Type)
- matches = [type_id]
- else
- matches = @type_variants[MIME::Type.simplified(type_id)]
- end
+ matches = case type_id
+ when MIME::Type
+ @type_variants[type_id.simplified]
+ when Regexp
+ match(type_id)
+ else
+ @type_variants[MIME::Type.simplified(type_id)]
+ end
- matches.delete_if { |e| not e.complete? } if flags[:complete]
- matches.delete_if { |e| not e.platform? } if flags[:platform]
-
- matches.sort { |a, b| a.priority_compare(b) }
+ prune_matches(matches, flags).sort { |a, b| a.priority_compare(b) }
end
# Return the list of MIME::Types which belongs to the file based on its
# filename extension. If +platform+ is +true+, then only file types that
# are specific to the current platform will be returned.
#
+ # This will always return an array.
+ #
# puts "MIME::Types.type_for('citydesk.xml')
- # => "#{MIME::Types.type_for('citydesk.xml')}"
+ # => [application/xml, text/xml]
# puts "MIME::Types.type_for('citydesk.gif')
- # => "#{MIME::Types.type_for('citydesk.gif')}"
+ # => [image/gif]
def type_for(filename, platform = false)
ext = filename.chomp.downcase.gsub(/.*\./o, '')
list = @extension_index[ext]
@@ -680,7 +691,7 @@
else
if @type_variants.include?(mime_type.simplified)
if @type_variants[mime_type.simplified].include?(mime_type)
- warn "Type #{mime_type} already registered as a variant of #{mime_type.simplified}." unless defined? MIME::Types::STARTUP
+ warn "Type #{mime_type} already registered as a variant of #{mime_type.simplified}." unless defined? MIME::Types::LOAD
end
end
add_type_variant(mime_type)
@@ -689,30 +700,47 @@
end
end
+ private
+ def prune_matches(matches, flags)
+ matches.delete_if { |e| not e.complete? } if flags[:complete]
+ matches.delete_if { |e| not e.platform? } if flags[:platform]
+ matches
+ end
+
+ def match(pattern)
+ matches = @type_variants.select { |k, v| k =~ pattern }
+ if matches.respond_to? :values
+ matches.values.flatten
+ else
+ matches.map { |m| m.last }.flatten
+ end
+ end
+
class << self
def add_type_variant(mime_type) #:nodoc:
- @__types__.add_type_variant(mime_type)
+ __types__.add_type_variant(mime_type)
end
def index_extensions(mime_type) #:nodoc:
- @__types__.index_extensions(mime_type)
+ __types__.index_extensions(mime_type)
end
# The regular expression used to match a file-based MIME type
# definition.
TEXT_FORMAT_RE = %r{
- ^
+ \A
\s*
([*])? # 0: Unregistered?
(!)? # 1: Obsolete?
(?:(\w+):)? # 2: Platform marker
- #{MIME::Type::MEDIA_TYPE_RE} # 3,4: Media type
+ #{MIME::Type::MEDIA_TYPE_RE}? # 3,4: Media type
(?:\s+@([^\s]+))? # 5: Extensions
(?:\s+:(#{MIME::Type::ENCODING_RE}))? # 6: Encoding
(?:\s+'(.+))? # 7: URL list
(?:\s+=(.+))? # 8: Documentation
+ (?:\s*([#].*)?)?
\s*
- $
+ \z
}x
# Build the type list from a file in the format:
@@ -753,26 +781,36 @@
# be provided.
def load_from_file(filename) #:nodoc:
if defined? ::Encoding
- data = File.open(filename, 'r:UTF-8') { |f| f.read }
+ data = File.open(filename, 'r:UTF-8:-') { |f| f.read }
else
data = File.open(filename) { |f| f.read }
end
data = data.split($/)
mime = MIME::Types.new
data.each_with_index { |line, index|
- item = line.chomp.strip.gsub(%r{#.*}o, '')
+ item = line.chomp.strip
next if item.empty?
begin
m = TEXT_FORMAT_RE.match(item).captures
- rescue Exception => ex
+ rescue Exception
puts "#{filename}:#{index}: Parsing error in MIME type definitions."
puts "=> #{line}"
raise
end
unregistered, obsolete, platform, mediatype, subtype, extensions,
- encoding, urls, docs = *m
+ encoding, urls, docs, comment = *m
+
+ if mediatype.nil?
+ if comment.nil?
+ puts "#{filename}:#{index}: Parsing error in MIME type definitions."
+ puts "=> #{line}"
+ raise RuntimeError
+ end
+
+ next
+ end
extensions &&= extensions.split(/,/)
urls &&= urls.split(/,/)
@@ -807,24 +845,36 @@
# puts t.to_a.join(", ")
# end
def [](type_id, flags = {})
- @__types__[type_id, flags]
+ __types__[type_id, flags]
+ end
+
+ include Enumerable
+
+ def count
+ __types__.count
+ end
+
+ def each
+ __types__.each {|t| yield t }
end
# Return the list of MIME::Types which belongs to the file based on
# its filename extension. If +platform+ is +true+, then only file
# types that are specific to the current platform will be returned.
#
+ # This will always return an array.
+ #
# puts "MIME::Types.type_for('citydesk.xml')
- # => "#{MIME::Types.type_for('citydesk.xml')}"
+ # => [application/xml, text/xml]
# puts "MIME::Types.type_for('citydesk.gif')
- # => "#{MIME::Types.type_for('citydesk.gif')}"
+ # => [image/gif]
def type_for(filename, platform = false)
- @__types__.type_for(filename, platform)
+ __types__.type_for(filename, platform)
end
# A synonym for MIME::Types.type_for
def of(filename, platform = false)
- @__types__.type_for(filename, platform)
+ __types__.type_for(filename, platform)
end
# Add one or more MIME::Type objects to the set of known types. Each
@@ -834,14 +884,82 @@
# Please inform the maintainer of this module when registered
# types are missing.
def add(*types)
- @__types__.add(*types)
+ __types__.add(*types)
+ end
+
+ # Returns the currently defined cache file, if any.
+ def cache_file
+ ENV['RUBY_MIME_TYPES_CACHE']
+ end
+
+ private
+ def load_mime_types_from_cache
+ load_mime_types_from_cache! if cache_file
+ end
+
+ def load_mime_types_from_cache!
+ raise ArgumentError, "No RUBY_MIME_TYPES_CACHE set." unless cache_file
+ return false unless File.exists? cache_file
+
+ begin
+ data = File.read(cache_file)
+ container = Marshal.load(data)
+
+ if container.version == VERSION
+ @__types__ = Marshal.load(container.data)
+ true
+ else
+ false
+ end
+ rescue => e
+ warn "Could not load MIME::Types cache: #{e}"
+ false
+ end
+ end
+
+ def write_mime_types_to_cache
+ write_mime_types_to_cache! if cache_file
+ end
+
+ def write_mime_types_to_cache!
+ raise ArgumentError, "No RUBY_MIME_TYPES_CACHE set." unless cache_file
+
+ File.open(cache_file, 'w') do |f|
+ cache = MIME::Types::CacheContainer.new(VERSION,
+ Marshal.dump(__types__))
+ f.write Marshal.dump(cache)
+ end
+
+ true
+ end
+
+ def load_and_parse_mime_types
+ const_set(:LOAD, true) unless $DEBUG
+ Dir[File.join(File.dirname(__FILE__), 'types', '*')].sort.each { |f|
+ add(load_from_file(f))
+ }
+ remove_const :LOAD if defined? LOAD
+ end
+
+ def lazy_load?
+ (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
+ end
+
+ def __types__
+ load_mime_types unless @__types__
+ @__types__
+ end
+
+ def load_mime_types
+ @__types__ = new(VERSION)
+ unless load_mime_types_from_cache
+ load_and_parse_mime_types
+ write_mime_types_to_cache
+ end
end
end
- files = Dir[File.join(File.dirname(__FILE__), 'types', '*')]
- MIME::Types::STARTUP = true unless $DEBUG
- files.sort.each { |file| add load_from_file(file) }
- remove_const :STARTUP if defined? STARTUP
+ load_mime_types unless lazy_load?
end
end
diff -Nru ruby-mime-types-1.17.2/lib/mime-types.rb ruby-mime-types-1.25/lib/mime-types.rb
--- ruby-mime-types-1.17.2/lib/mime-types.rb 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/lib/mime-types.rb 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,3 @@
+# -*- ruby encoding: utf-8 -*-
+
+require 'mime/types'
diff -Nru ruby-mime-types-1.17.2/metadata.gz.sig ruby-mime-types-1.25/metadata.gz.sig
--- ruby-mime-types-1.17.2/metadata.gz.sig 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/metadata.gz.sig 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,2 @@
+oA$!(tآⲨSD]zLhT<*Pnآ~n)VQ54`K uĂ9/K uqf3#ܨK6PuJڙM A\7|=/oyCN'Uɮ,'J8.JVgA`Q{f95G?n0Ħ1~tA pN%ԕV"
uw̬ Pl^N,Kk
+J3 'W
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/metadata.yml ruby-mime-types-1.25/metadata.yml
--- ruby-mime-types-1.17.2/metadata.yml 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/metadata.yml 2013-09-14 14:09:18.000000000 +0000
@@ -1,201 +1,310 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
name: mime-types
-version: !ruby/object:Gem::Version
- hash: 87
- prerelease:
- segments:
- - 1
- - 17
- - 2
- version: 1.17.2
+version: !ruby/object:Gem::Version
+ version: '1.25'
platform: ruby
-authors:
+authors:
- Austin Ziegler
autorequire:
bindir: bin
-cert_chain: []
-
-date: 2011-10-26 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+cert_chain:
+- !binary |-
+ LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
+ Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVE4d0RRWURWUVFEREFaaGRY
+ TjAKYVc0eEdUQVhCZ29Ka2lhSmsvSXNaQUVaRmdseWRXSjVabTl5WjJVeEV6
+ QVJCZ29Ka2lhSmsvSXNaQUVaRmdOdgpjbWN3SGhjTk1UTXdNakEwTURNek16
+ STNXaGNOTVRRd01qQTBNRE16TXpJM1dqQkJNUTh3RFFZRFZRUUREQVpoCmRY
+ TjBhVzR4R1RBWEJnb0praWFKay9Jc1pBRVpGZ2x5ZFdKNVptOXlaMlV4RXpB
+ UkJnb0praWFKay9Jc1pBRVoKRmdOdmNtY3dnZ0VpTUEwR0NTcUdTSWIzRFFF
+ QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDMm1QTmY0TDM3R2hLSQpTUENZc3ZZ
+ V1hBMi9SOXU1K3B5VW5iSjJSMW8yQ2lScTJaQS9BSXpZNk4zaEduc2dvV25o
+ NVJ6dmdUTjFMdDA4CkROSXJzSUcyVkRZay9KVnQ2ZjlKNnpaOEVRSGJ6bldh
+ M2NXWW9DRmFhSUNkazdqVjFuLzQyaGc3MGpFRFlYbDkKZ0RPbDBrNkpteUYv
+ cnRmRnUvT0lrRkdXZUZZSXVGSHZSdUx5VWJ3NjYrUURUT3pLYjN0OG81NUlo
+ Z3kxR1Z3VAppNnBrRHM4TGhaV1hkT0QrOTIxbDJaMU5aR1phOUtOYkpJZzZ2
+ dGdZS1U5OGpRNXFyOWlZM2lrQkFzcEhyRmFzCks2VVN2R2dBZzhmQ0Q1WWlv
+ dEJFdkNCTVl0ZnFtZnJocGRVMnArZ3ZUZ2VMVzFLYWV2d3FkN25nUW1GVXJG
+ RzEKZVVKU1VSdjVBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
+ ME9CQllFRkF0SktNcDZZWU5xbGdSMwo5VGlaTFdxdkxhZ1NNQXNHQTFVZER3
+ UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQXBUUGt2RG04Cjdn
+ SmxVVDRGZnVtWFB2dHVxUDY3THhVdEdFOHN5dlIwQTRBcyswUC93eWxMSkZV
+ T3NHVFRkWll0VGhoeENTSkcKKzdLRzJGZkljSDRaejJkOTdhclpHQXpCb2k4
+ aVBodDIvVXRTbDFmQ2NVSTV2bUphMU1pWFpUMm9xZFc3V3lkcQpyQVpjQlBs
+ cllZdWl3dEdJMHlxSU9nQmZYU1pDV1dzSnN1eVRLRUxlcDZtQ0xnejBZWlVm
+ bXZLcjhXL0FiM2F4CkR1THpIOTJMU1JqWkp5anlBVXB3L1ZjMnJNNGdpaVA1
+ anRCeXJiMVkxZEduUWhIVE1IZjFHZnVjV203TncvVjkKdHdFUFZ3OCswZjg4
+ SlF1Y3hPVG1URjFOYkxGcGlSd1FVWjF6b1piTmcyZTdtU2hjL2VleG5WTFdL
+ Rkt4Um9QNgpLUGozV29EK3NwQjhmQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
+ LS0tLS0K
+date: 2013-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
name: rubyforge
- prerelease: false
- requirement: &id001 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 7
- segments:
- - 2
- - 0
- - 4
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
version: 2.0.4
type: :development
- version_requirements: *id001
-- !ruby/object:Gem::Dependency
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
+ version: 2.0.4
+- !ruby/object:Gem::Dependency
name: minitest
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '5.0'
+ type: :development
prerelease: false
- requirement: &id002 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 19
- segments:
- - 2
- - 6
- - 2
- version: 2.6.2
- type: :development
- version_requirements: *id002
-- !ruby/object:Gem::Dependency
- name: nokogiri
- prerelease: false
- requirement: &id003 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 5
- segments:
- - 1
- - 5
- version: "1.5"
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '5.0'
+- !ruby/object:Gem::Dependency
+ name: rdoc
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '4.0'
type: :development
- version_requirements: *id003
-- !ruby/object:Gem::Dependency
- name: minitest
prerelease: false
- requirement: &id004 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 2
- - 0
- version: "2.0"
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '4.0'
+- !ruby/object:Gem::Dependency
+ name: hoe-bundler
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.2'
type: :development
- version_requirements: *id004
-- !ruby/object:Gem::Dependency
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.2'
+- !ruby/object:Gem::Dependency
name: hoe-doofus
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.0'
+ type: :development
prerelease: false
- requirement: &id005 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 15
- segments:
- - 1
- - 0
- version: "1.0"
- type: :development
- version_requirements: *id005
-- !ruby/object:Gem::Dependency
- name: hoe-gemspec
- prerelease: false
- requirement: &id006 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 15
- segments:
- - 1
- - 0
- version: "1.0"
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.0'
+- !ruby/object:Gem::Dependency
+ name: hoe-gemspec2
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.1'
type: :development
- version_requirements: *id006
-- !ruby/object:Gem::Dependency
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.1'
+- !ruby/object:Gem::Dependency
name: hoe-git
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.5'
+ type: :development
prerelease: false
- requirement: &id007 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 15
- segments:
- - 1
- - 0
- version: "1.0"
- type: :development
- version_requirements: *id007
-- !ruby/object:Gem::Dependency
- name: hoe-seattlerb
- prerelease: false
- requirement: &id008 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 15
- segments:
- - 1
- - 0
- version: "1.0"
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.5'
+- !ruby/object:Gem::Dependency
+ name: hoe-rubygems
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.0'
type: :development
- version_requirements: *id008
-- !ruby/object:Gem::Dependency
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.0'
+- !ruby/object:Gem::Dependency
+ name: hoe-travis
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.2'
+ type: :development
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '1.2'
+- !ruby/object:Gem::Dependency
+ name: rake
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '10.0'
+ type: :development
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '10.0'
+- !ruby/object:Gem::Dependency
name: hoe
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '3.7'
+ type: :development
prerelease: false
- requirement: &id009 !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- hash: 27
- segments:
- - 2
- - 12
- version: "2.12"
- type: :development
- version_requirements: *id009
-description: |-
- This library allows for the identification of a file's likely MIME content
- type. This is release 1.17.2. The identification of MIME content type is based
- on a file's filename extensions.
-
- MIME::Types for Ruby originally based on and synchronized with MIME::Types for
- Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
- format for the MIME::Type list has changed and the synchronization will no
- longer happen.
-
- Homepage:: http://mime-types.rubyforge.org/
- GitHub:: http://github.com/halostatue/mime-types/
- Copyright:: 2002 - 2011, Austin Ziegler
- Based in part on prior work copyright Mark Overmeer
-
- :include: License.rdoc
-email:
+ version_requirements: !ruby/object:Gem::Requirement
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '3.7'
+description: ! 'This library allows for the identification of a file''s likely MIME
+ content
+
+ type. This is release 1.25, adding experimental caching and lazy loading
+
+ functionality.
+
+
+ The caching and lazy loading features were initially implemented by Greg
+
+ Brockman (gdb). As these features are experimental, they are disabled by
+
+ default and must be enabled through the use of environment variables. The cache
+
+ is invalidated on a per-version basis; the cache for version 1.25 will not be
+
+ reused for version 1.26.
+
+
+ To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
+
+ to any value other than ''false''. When using lazy loading, the initial startup
+
+ of MIME::Types is around 12–25× faster than normal startup (on my system,
+
+ normal startup is about 90 ms; lazy startup is about 4 ms). This isn''t
+
+ generally useful, however, as the MIME::Types database has not been loaded.
+
+ Lazy startup and load is just *slightly* faster—around 1 ms. The real advantage
+
+ comes from using the cache.
+
+
+ To enable the cache, set the environment variable +RUBY_MIME_TYPES_CACHE+ to a
+
+ filename where MIME::Types will have read-write access. The first time a new
+
+ version of MIME::Types is run using this file, it will be created, taking a
+
+ little longer than normal. Subsequent loads using the same cache file will be
+
+ approximately 3½× faster (25 ms) than normal loads. This can be combined with
+
+ +RUBY_MIME_TYPES_LAZY_LOAD+, but this is *not* recommended in a multithreaded
+
+ or multiprocess environment where all threads or processes will be using the
+
+ same cache file.
+
+
+ As the caching interface is still experimental, the only values cached are the
+
+ default MIME::Types database, not any custom MIME::Types added by users.
+
+
+ MIME types are used in MIME-compliant communications, as in e-mail or HTTP
+
+ traffic, to indicate the type of content which is transmitted. MIME::Types
+
+ provides the ability for detailed information about MIME entities (provided as
+
+ a set of MIME::Type objects) to be determined and used programmatically. There
+
+ are many types defined by RFCs and vendors, so the list is long but not
+
+ complete; don''t hesitate to ask to add additional information. This library
+
+ follows the IANA collection of MIME types (see below for reference).
+
+
+ MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark
+
+ Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the
+
+ MIME::Type list has changed and the synchronization will no longer happen.
+
+
+ MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
+
+ tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
+
+ ({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
+
+ added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
+
+ and added by the users of MIME::Types.'
+email:
- austin@rubyforge.org
executables: []
-
extensions: []
-
-extra_rdoc_files:
-- Manifest.txt
-- type-lists/application.txt
-- type-lists/audio.txt
-- type-lists/image.txt
-- type-lists/message.txt
-- type-lists/model.txt
-- type-lists/multipart.txt
-- type-lists/text.txt
-- type-lists/video.txt
+extra_rdoc_files:
+- Contributing.rdoc
- History.rdoc
-- License.rdoc
+- Licence.rdoc
+- Manifest.txt
- README.rdoc
-files:
+- docs/COPYING.txt
+- docs/artistic.txt
+files:
+- .gemtest
- .hoerc
+- .travis.yml
+- Contributing.rdoc
+- Gemfile
- History.rdoc
-- License.rdoc
+- Licence.rdoc
- Manifest.txt
- README.rdoc
- Rakefile
+- docs/COPYING.txt
+- docs/artistic.txt
+- lib/mime-types.rb
- lib/mime/types.rb
- lib/mime/types/application
- lib/mime/types/application.mac
@@ -221,52 +330,41 @@
- lib/mime/types/video
- lib/mime/types/video.nonstandard
- lib/mime/types/video.obsolete
-- mime-types.gemspec
- test/test_mime_type.rb
- test/test_mime_types.rb
-- type-lists/application.txt
-- type-lists/audio.txt
-- type-lists/image.txt
-- type-lists/message.txt
-- type-lists/model.txt
-- type-lists/multipart.txt
-- type-lists/text.txt
-- type-lists/video.txt
-- .gemtest
+- test/test_mime_types_cache.rb
+- test/test_mime_types_lazy.rb
homepage: http://mime-types.rubyforge.org/
-licenses: []
-
+licenses:
+- MIT
+- Artistic 2.0
+- GPL-2
+metadata: {}
post_install_message:
-rdoc_options:
+rdoc_options:
- --main
- README.rdoc
-require_paths:
+require_paths:
- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
- none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 0
- version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
+ version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
+ version: '0'
requirements: []
-
rubyforge_project: mime-types
-rubygems_version: 1.8.10
+rubygems_version: 2.0.7
signing_key:
-specification_version: 3
-summary: This library allows for the identification of a file's likely MIME content type
-test_files:
+specification_version: 4
+summary: This library allows for the identification of a file's likely MIME content
+ type
+test_files:
- test/test_mime_type.rb
- test/test_mime_types.rb
+- test/test_mime_types_cache.rb
+- test/test_mime_types_lazy.rb
diff -Nru ruby-mime-types-1.17.2/mime-types.gemspec ruby-mime-types-1.25/mime-types.gemspec
--- ruby-mime-types-1.17.2/mime-types.gemspec 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/mime-types.gemspec 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
- s.name = "mime-types"
- s.version = "1.17.2"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Austin Ziegler"]
- s.date = "2011-10-25"
- s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.17.2. The identification of MIME content type is based\non a file's filename extensions.\n\nMIME::Types for Ruby originally based on and synchronized with MIME::Types for\nPerl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data\nformat for the MIME::Type list has changed and the synchronization will no\nlonger happen.\n\nHomepage:: http://mime-types.rubyforge.org/\nGitHub:: http://github.com/halostatue/mime-types/\nCopyright:: 2002 - 2011, Austin Ziegler\n Based in part on prior work copyright Mark Overmeer\n\n:include: License.rdoc"
- s.email = ["austin@rubyforge.org"]
- s.extra_rdoc_files = ["Manifest.txt", "type-lists/application.txt", "type-lists/audio.txt", "type-lists/image.txt", "type-lists/message.txt", "type-lists/model.txt", "type-lists/multipart.txt", "type-lists/text.txt", "type-lists/video.txt", "History.rdoc", "License.rdoc", "README.rdoc"]
- s.files = [".hoerc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "lib/mime/types.rb", "lib/mime/types/application", "lib/mime/types/application.mac", "lib/mime/types/application.nonstandard", "lib/mime/types/application.obsolete", "lib/mime/types/audio", "lib/mime/types/audio.nonstandard", "lib/mime/types/audio.obsolete", "lib/mime/types/image", "lib/mime/types/image.nonstandard", "lib/mime/types/image.obsolete", "lib/mime/types/message", "lib/mime/types/message.obsolete", "lib/mime/types/model", "lib/mime/types/multipart", "lib/mime/types/multipart.nonstandard", "lib/mime/types/multipart.obsolete", "lib/mime/types/other.nonstandard", "lib/mime/types/text", "lib/mime/types/text.nonstandard", "lib/mime/types/text.obsolete", "lib/mime/types/text.vms", "lib/mime/types/video", "lib/mime/types/video.nonstandard", "lib/mime/types/video.obsolete", "mime-types.gemspec", "test/test_mime_type.rb", "test/test_mime_types.rb", "type-lists/application.txt", "type-lists/audio.txt", "type-lists/image.txt", "type-lists/message.txt", "type-lists/model.txt", "type-lists/multipart.txt", "type-lists/text.txt", "type-lists/video.txt", "License.rdoc", ".gemtest"]
- s.homepage = "http://mime-types.rubyforge.org/"
- s.rdoc_options = ["--main", "README.rdoc"]
- s.require_paths = ["lib"]
- s.rubyforge_project = "mime-types"
- s.rubygems_version = "1.8.10"
- s.summary = "This library allows for the identification of a file's likely MIME content type"
- s.test_files = ["test/test_mime_type.rb", "test/test_mime_types.rb"]
-
- if s.respond_to? :specification_version then
- s.specification_version = 3
-
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_development_dependency(%q, [">= 2.0.4"])
- s.add_development_dependency(%q, [">= 2.6.2"])
- s.add_development_dependency(%q, ["~> 1.5"])
- s.add_development_dependency(%q, ["~> 2.0"])
- s.add_development_dependency(%q, ["~> 1.0"])
- s.add_development_dependency(%q, ["~> 1.0"])
- s.add_development_dependency(%q, ["~> 1.0"])
- s.add_development_dependency(%q, ["~> 1.0"])
- s.add_development_dependency(%q, ["~> 2.12"])
- else
- s.add_dependency(%q, [">= 2.0.4"])
- s.add_dependency(%q, [">= 2.6.2"])
- s.add_dependency(%q, ["~> 1.5"])
- s.add_dependency(%q, ["~> 2.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 2.12"])
- end
- else
- s.add_dependency(%q, [">= 2.0.4"])
- s.add_dependency(%q, [">= 2.6.2"])
- s.add_dependency(%q, ["~> 1.5"])
- s.add_dependency(%q, ["~> 2.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 1.0"])
- s.add_dependency(%q, ["~> 2.12"])
- end
-end
diff -Nru ruby-mime-types-1.17.2/test/test_mime_type.rb ruby-mime-types-1.25/test/test_mime_type.rb
--- ruby-mime-types-1.17.2/test/test_mime_type.rb 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/test/test_mime_type.rb 2013-09-14 14:09:18.000000000 +0000
@@ -1,12 +1,10 @@
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+# -*- ruby encoding: utf-8 -*-
require 'mime/types'
-require 'minitest/autorun'
-#require 'test/unit' unless defined? $ZENTEST and $ZENTEST
-class TestMIME_Type < MiniTest::Unit::TestCase
+class TestMIMEType < Minitest::Test
def yaml_mime_type_from_array
- yaml = MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'linux')
+ MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'd9d172f608')
end
def setup
@@ -22,7 +20,7 @@
def test_class_from_hash
yaml = MIME::Type.from_hash('Content-Type' => 'text/x-yaml',
'Content-Transfer-Encoding' => '8bit',
- 'System' => 'linux',
+ 'System' => 'd9d172f608',
'Extensions' => %w(yaml yml))
assert_instance_of(MIME::Type, yaml)
assert_equal('text/yaml', yaml.simplified)
@@ -247,7 +245,7 @@
def test_system_equals
yaml = yaml_mime_type_from_array
- assert_equal(yaml.system, %r{linux})
+ assert_equal(yaml.system, %r{d9d172f608})
yaml.system = /win32/
assert_equal(yaml.system, %r{win32})
yaml.system = nil
@@ -264,7 +262,7 @@
def test_to_a
yaml = yaml_mime_type_from_array
assert_equal(yaml.to_a, ['text/x-yaml', %w(yaml yml), '8bit',
- /linux/, nil, nil, nil, false])
+ /d9d172f608/, nil, nil, nil, false])
end
def test_to_hash
@@ -273,7 +271,7 @@
{ 'Content-Type' => 'text/x-yaml',
'Content-Transfer-Encoding' => '8bit',
'Extensions' => %w(yaml yml),
- 'System' => /linux/,
+ 'System' => /d9d172f608/,
'Registered' => false,
'URL' => nil,
'Obsolete' => nil,
@@ -289,7 +287,7 @@
yaml = MIME::Type.new('text/x-yaml') do |y|
y.extensions = %w(yaml yml)
y.encoding = '8bit'
- y.system = 'linux'
+ y.system = 'd9d172f608'
end
assert_instance_of(MIME::Type, yaml)
assert_raises(MIME::InvalidContentType) { MIME::Type.new('apps') }
diff -Nru ruby-mime-types-1.17.2/test/test_mime_types.rb ruby-mime-types-1.25/test/test_mime_types.rb
--- ruby-mime-types-1.17.2/test/test_mime_types.rb 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/test/test_mime_types.rb 2013-09-14 14:09:18.000000000 +0000
@@ -1,8 +1,13 @@
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+# -*- ruby encoding: utf-8 -*-
require 'mime/types'
-class TestMIME_Types < MiniTest::Unit::TestCase #:nodoc:
+class TestMIMETypes < Minitest::Test
+ def setup
+ MIME::Types.instance_variable_set(:@__types__, nil)
+ MIME::Types.send(:load_mime_types)
+ end
+
def test_class_index_1
text_plain = MIME::Type.new('text/plain') do |t|
t.encoding = '8bit'
@@ -69,6 +74,24 @@
assert(MIME::Types.of('zzz').empty?)
end
+ def test_class_enumerable
+ assert( MIME::Types.any? {|type| type.content_type == 'text/plain'} )
+ end
+
+ def test_class_count
+ assert(MIME::Types.count > 42, "A lot of types are expected to be known.")
+ end
+
+ def test_ebook_formats
+ assert_equal( MIME::Types['application/x-mobipocket-ebook'], MIME::Types.type_for("book.mobi"))
+ assert_equal( MIME::Types['application/epub+zip'], MIME::Types.type_for("book.epub"))
+ assert_equal( MIME::Types['application/x-ibooks+zip'], MIME::Types.type_for("book.ibooks") )
+ end
+
+ def test_apple_formats
+ assert_equal( MIME::Types['application/x-apple-diskimage'], MIME::Types.type_for("disk.dmg") )
+ end
+
def _test_add
raise NotImplementedError, 'Need to write test_add'
end
diff -Nru ruby-mime-types-1.17.2/test/test_mime_types_cache.rb ruby-mime-types-1.25/test/test_mime_types_cache.rb
--- ruby-mime-types-1.17.2/test/test_mime_types_cache.rb 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/test/test_mime_types_cache.rb 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,77 @@
+# -*- ruby encoding: utf-8 -*-
+
+require 'mime/types'
+
+class TestMIMETypesCache < Minitest::Test
+ def setup
+ require 'fileutils'
+ @cache_file = File.expand_path('../cache.tst', __FILE__)
+ ENV['RUBY_MIME_TYPES_CACHE'] = @cache_file
+ clear_cache_file
+ end
+
+ def teardown
+ clear_cache_file
+ ENV.delete('RUBY_MIME_TYPES_CACHE')
+ end
+
+ def reset_mime_types
+ MIME::Types.instance_variable_set(:@__types__, nil)
+ MIME::Types.send(:load_mime_types)
+ end
+
+ def clear_cache_file
+ FileUtils.rm @cache_file if File.exist? @cache_file
+ end
+
+ def test_uses_correct_cache_file
+ assert_equal(@cache_file, MIME::Types.cache_file)
+ end
+
+ def test_does_not_use_cache_when_unset
+ ENV.delete('RUBY_MIME_TYPES_CACHE')
+ assert_equal(nil, MIME::Types.send(:load_mime_types_from_cache))
+ end
+
+ def test_raises_exception_when_load_forced_without_cache_file
+ assert_raises(ArgumentError) {
+ ENV.delete('RUBY_MIME_TYPES_CACHE')
+ MIME::Types.send(:load_mime_types_from_cache!)
+ }
+ end
+
+ def test_does_not_use_cache_when_missing
+ assert_equal(false, MIME::Types.send(:load_mime_types_from_cache))
+ end
+
+ def test_does_not_create_cache_when_unset
+ ENV.delete('RUBY_MIME_TYPES_CACHE')
+ assert_equal(nil, MIME::Types.send(:write_mime_types_to_cache))
+ end
+
+ def test_raises_exception_when_write_forced_without_cache_file
+ assert_raises(ArgumentError) {
+ ENV.delete('RUBY_MIME_TYPES_CACHE')
+ MIME::Types.send(:write_mime_types_to_cache!)
+ }
+ end
+
+ def test_creates_cache
+ assert_equal(false, File.exist?(@cache_file))
+ MIME::Types.send(:write_mime_types_to_cache)
+ assert_equal(true, File.exist?(@cache_file))
+ end
+
+ def test_uses_cache
+ html = MIME::Types['text/html'].first
+ html.extensions << 'hex'
+ MIME::Types.send(:write_mime_types_to_cache)
+ MIME::Types.instance_variable_set(:@__types__, nil)
+
+ assert_equal(true, MIME::Types.send(:load_mime_types_from_cache))
+ html = MIME::Types['text/html'].first
+ assert_includes(html.extensions, 'hex')
+
+ reset_mime_types
+ end
+end
diff -Nru ruby-mime-types-1.17.2/test/test_mime_types_lazy.rb ruby-mime-types-1.25/test/test_mime_types_lazy.rb
--- ruby-mime-types-1.17.2/test/test_mime_types_lazy.rb 1970-01-01 00:00:00.000000000 +0000
+++ ruby-mime-types-1.25/test/test_mime_types_lazy.rb 2013-09-14 14:09:18.000000000 +0000
@@ -0,0 +1,40 @@
+# -*- ruby encoding: utf-8 -*-
+
+require 'mime/types'
+
+class TestMIMETypesLazy < Minitest::Test
+ def setup
+ ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'true'
+ ENV['RUBY_MIME_TYPES_CACHE'] = File.expand_path('../cache.tst', __FILE__)
+ MIME::Types.send(:write_mime_types_to_cache)
+ end
+
+ def teardown
+ reset_mime_types
+ if File.exist? ENV['RUBY_MIME_TYPES_CACHE']
+ FileUtils.rm ENV['RUBY_MIME_TYPES_CACHE']
+ ENV.delete('RUBY_MIME_TYPES_CACHE')
+ end
+ ENV.delete('RUBY_MIME_TYPES_LAZY_LOAD')
+ end
+
+ def reset_mime_types
+ MIME::Types.instance_variable_set(:@__types__, nil)
+ MIME::Types.send(:load_mime_types)
+ end
+
+ def test_lazy_load?
+ assert_equal(true, MIME::Types.send(:lazy_load?))
+ ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = nil
+ assert_equal(nil, MIME::Types.send(:lazy_load?))
+ ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'false'
+ assert_equal(false, MIME::Types.send(:lazy_load?))
+ end
+
+ def test_lazy_loading
+ MIME::Types.instance_variable_set(:@__types__, nil)
+ assert_nil(MIME::Types.instance_variable_get(:@__types__))
+ refute_nil(MIME::Types['text/html'].first)
+ refute_nil(MIME::Types.instance_variable_get(:@__types__))
+ end
+end
diff -Nru ruby-mime-types-1.17.2/type-lists/application.txt ruby-mime-types-1.25/type-lists/application.txt
--- ruby-mime-types-1.17.2/type-lists/application.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/application.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,951 +0,0 @@
-application/1d-interleaved-parityfec 'IANA,RFC6015
-application/3gpp-ims+xml 'IANA,[Meredith]
-application/activemessage 'IANA,[Shapiro]
-application/andrew-inset 'IANA,[Borenstein]
-application/applefile 'IANA,[Faltstrom]
-application/atom+xml 'IANA,RFC4287,RFC5023
-application/atomicmail 'IANA,[Borenstein]
-application/atomcat+xml 'IANA,RFC5023
-application/atomsvc+xml 'IANA,RFC5023
-application/auth-policy+xml 'IANA,RFC4745
-application/batch-SMTP 'IANA,RFC2442
-application/beep+xml 'IANA,RFC3080
-application/calendar+xml 'IANA,RFC6321
-application/cals-1840 'IANA,RFC1895
-application/ccmp+xml 'IANA,{RFC-ietf-xcon-ccmp-15.txt=http://http://tools.ietf.org/html/draft-ietf-xcon-ccmp}
-application/ccxml+xml 'IANA,RFC4267
-application/cdmi-capability 'IANA,RFC6208
-application/cdmi-container 'IANA,RFC6208
-application/cdmi-domain 'IANA,RFC6208
-application/cdmi-object 'IANA,RFC6208
-application/cdmi-queue 'IANA,RFC6208
-application/cea-2018+xml 'IANA,[Zimmermann]
-application/cellml+xml 'IANA,RFC4708
-application/cfw 'IANA,RFC6230
-application/cnrp+xml 'IANA,RFC3367
-application/commonground 'IANA,[Glazer]
-application/conference-info+xml 'IANA,RFC4575
-application/cpl+xml 'IANA,RFC3880
-application/csta+xml 'IANA,[Ecma International Helpdesk]
-application/CSTAdata+xml 'IANA,[Ecma International Helpdesk]
-application/cybercash 'IANA,[Eastlake]
-application/davmount+xml 'IANA,RFC4709
-application/dca-rft 'IANA,[Campbell]
-application/dec-dx 'IANA,[Campbell]
-application/dialog-info+xml 'IANA,RFC4235
-application/dicom 'IANA,RFC3240
-application/dns 'IANA,RFC4027
-application/dskpp+xml 'IANA,RFC6063
-application/dssc+der 'IANA,RFC5698
-application/dssc+xml 'IANA,RFC5698
-application/dvcs 'IANA,RFC3029
-application/ecmascript 'IANA,RFC4329
-application/EDI-Consent 'IANA,RFC1767
-application/EDIFACT 'IANA,RFC1767
-application/EDI-X12 'IANA,RFC1767
-application/emma+xml 'IANA,[W3C]
-application/epp+xml 'IANA,RFC5730
-application/eshop 'IANA,[Katz]
-application/example 'IANA,RFC4735
-application/exi 'IANA,[W3C]
-application/fastinfoset 'IANA,[ITU-T ASN.1 Rapporteur]
-application/fastsoap 'IANA,[ITU-T ASN.1 Rapporteur]
-application/fits 'IANA,RFC4047
-application/font-tdpfr 'IANA,RFC3073
-application/framework-attributes+xml 'IANA,RFC6230
-application/H224 'IANA,RFC4573
-application/held+xml 'IANA,RFC5985
-application/http 'IANA,RFC2616
-application/hyperstudio 'IANA,[Domino]
-application/ibe-key-request+xml 'IANA,RFC5408
-application/ibe-pkg-reply+xml 'IANA,RFC5408
-application/ibe-pp-data 'IANA,RFC5408
-application/iges 'IANA,[Parks]
-application/im-iscomposing+xml 'IANA,RFC3994
-application/index 'IANA,RFC2652
-application/index.cmd 'IANA,RFC2652
-application/index.obj 'IANA,RFC2652
-application/index.response 'IANA,RFC2652
-application/index.vnd 'IANA,RFC2652
-application/inkml+xml 'IANA,[Ashimura]
-application/iotp 'IANA,RFC2935
-application/ipfix 'IANA,RFC5655
-application/ipp 'IANA,RFC2910
-application/isup 'IANA,RFC3204
-application/javascript 'IANA,RFC4329
-application/json 'IANA,RFC4627
-application/kpml-request+xml 'IANA,RFC4730
-application/kpml-response+xml 'IANA,RFC4730
-application/lost+xml 'IANA,RFC5222
-application/mac-binhex40 'IANA,[Faltstrom]
-application/macwriteii 'IANA,[Lindner]
-application/mads+xml 'IANA,RFC6207
-application/marc 'IANA,RFC2220
-application/marcxml+xml 'IANA,RFC6207
-application/mathematica 'IANA,[Wolfram]
-application/mathml-content+xml 'IANA,[W3C]
-application/mathml-presentation+xml 'IANA,[W3C]
-application/mathml+xml 'IANA,[W3C]
-application/mbms-associated-procedure-description+xml 'IANA,[3GPP]
-application/mbms-deregister+xml 'IANA,[3GPP]
-application/mbms-envelope+xml 'IANA,[3GPP]
-application/mbms-msk-response+xml 'IANA,[3GPP]
-application/mbms-msk+xml 'IANA,[3GPP]
-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-user-service-description+xml 'IANA,[3GPP]
-application/mbox 'IANA,RFC4155
-application/media_control+xml 'IANA,RFC5168
-application/mediaservercontrol+xml 'IANA,RFC5022
-application/metalink4+xml 'IANA,RFC5854
-application/mets+xml 'IANA,RFC6207
-application/mikey 'IANA,RFC3830
-application/mods+xml 'IANA,RFC6207
-application/moss-keys 'IANA,RFC1848
-application/moss-signature 'IANA,RFC1848
-application/mosskey-data 'IANA,RFC1848
-application/mosskey-request 'IANA,RFC1848
-application/mp21 'IANA,RFC6381,[Singer]
-application/mp4 'IANA,RFC4337,RFC6381
-application/mpeg4-generic 'IANA,RFC3640
-application/mpeg4-iod 'IANA,RFC4337
-application/mpeg4-iod-xmt 'IANA,RFC4337
-application/msc-ivr+xml 'IANA,RFC6231
-application/msc-mixer+xml 'IANA,{RFC-ietf-mediactrl-mixer-control-package-14=http://tools.ietf.org/html/draft-ietf-mediactrl-mixer-control-package}
-application/msword 'IANA,[Lindner]
-application/mxf 'IANA,RFC4539
-application/nasdata 'IANA,RFC4707
-application/news-checkgroups 'IANA,RFC5537
-application/news-groupinfo 'IANA,RFC5537
-application/news-transmission 'IANA,RFC5537
-application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,RFC2560
-application/ocsp-response 'IANA,RFC2560
-application/octet-stream 'IANA,RFC2045,RFC2046
-application/oda 'IANA,RFC2045,RFC2046
-application/oebps-package+xml 'IANA,RFC4839
-application/ogg 'IANA,RFC5334
-application/oxps 'IANA,[Ecma International Helpdesk]
-application/parityfec 'IANA,RFC5109
-application/patch-ops-error+xml 'IANA,RFC5261
-application/pdf 'IANA,RFC3778
-application/pgp-encrypted 'IANA,RFC3156
-application/pgp-keys 'IANA,RFC3156
-application/pgp-signature 'IANA,RFC3156
-application/pidf+xml 'IANA,RFC3863
-application/pidf-diff+xml 'IANA,RFC5262
-application/pkcs10 'IANA,RFC5967
-application/pkcs7-mime 'IANA,RFC5751
-application/pkcs7-signature 'IANA,RFC5751
-application/pkcs8 'IANA,RFC5958
-application/pkix-attr-cert 'IANA,RFC5877
-application/pkix-cert 'IANA,RFC2585
-application/pkixcmp 'IANA,RFC2510
-application/pkix-crl 'IANA,RFC2585
-application/pkix-pkipath 'IANA,RFC6066
-application/pls+xml 'IANA,RFC4267
-application/poc-settings+xml 'IANA,RFC4354
-application/postscript 'IANA,RFC2045,RFC2046
-application/prs.alvestrand.titrax-sheet 'IANA,[Alvestrand]
-application/prs.cww 'IANA,[Rungchavalnont]
-application/prs.nprend 'IANA,[Doggett]
-application/prs.plucker 'IANA,[Janssen]
-application/prs.rdf-xml-crypt 'IANA,[Inkster]
-application/prs.xsf+xml 'IANA,[Stührenberg=Stuhrenberg]
-application/pskc+xml 'IANA,RFC6030
-application/rdf+xml 'IANA,RFC3870
-application/qsig 'IANA,RFC3204
-application/reginfo+xml 'IANA,RFC3680
-application/relax-ng-compact-syntax 'IANA,{ISO/IEC 19757-2:2003/FDAM-1=http://www.jtc1sc34.org/repository/0661.pdf}
-application/remote-printing 'IANA,RFC1486,[Rose]
-application/resource-lists-diff+xml 'IANA,RFC5362
-application/resource-lists+xml 'IANA,RFC4826
-application/riscos 'IANA,[Smith]
-application/rlmi+xml 'IANA,RFC4662
-application/rls-services+xml 'IANA,RFC4826
-application/rpki-manifest 'IANA,{RFC-ietf-sidr-repos-struct-09.txt=http://tools.ietf.org/html/draft-ietf-sidr-repos-struct}
-application/rpki-roa 'IANA,{RFC-ietf-sidr-repos-struct-09.txt=http://tools.ietf.org/html/draft-ietf-sidr-repos-struct}
-application/rpki-updown 'IANA,{RFC-ietf-sidr-rescerts-provisioning-11.txt=http://tools.ietf.org/html/draft-ietf-sidr-rescerts-provisioning}
-application/rtf 'IANA,[Lindner]
-application/rtx 'IANA,RFC4588
-application/samlassertion+xml 'IANA,[OASIS Security Services Technical Committee (SSTC)]
-application/samlmetadata+xml 'IANA,[OASIS Security Services Technical Committee (SSTC)]
-application/sbml+xml 'IANA,RFC3823
-application/scvp-cv-request 'IANA,RFC5055
-application/scvp-cv-response 'IANA,RFC5055
-application/scvp-vp-request 'IANA,RFC5055
-application/scvp-vp-response 'IANA,RFC5055
-application/sdp 'IANA,RFC4566
-application/set-payment 'IANA,[Korver]
-application/set-payment-initiation 'IANA,[Korver]
-application/set-registration 'IANA,[Korver]
-application/set-registration-initiation 'IANA,[Korver]
-application/sgml 'IANA,RFC1874
-application/sgml-open-catalog 'IANA,[Grosso]
-application/shf+xml 'IANA,RFC4194
-application/sieve 'IANA,RFC5228
-application/simple-filter+xml 'IANA,RFC4661
-application/simple-message-summary 'IANA,{RFC3842=http://www.rfc-editor.org/rfc/rfcxxxx.txt}
-application/simpleSymbolContainer 'IANA,[3GPP]
-application/slate 'IANA,[Crowley]
-application/smil (OBSOLETE) 'IANA,RFC4536
-application/smil+xml 'IANA,RFC4536
-application/soap+fastinfoset 'IANA,[ITU-T ASN.1 Rapporteur]
-application/soap+xml 'IANA,RFC3902
-application/sparql-query 'IANA,[W3C]
-application/sparql-results+xml 'IANA,[W3C]
-application/spirits-event+xml 'IANA,RFC3910
-application/srgs 'IANA,RFC4267
-application/srgs+xml 'IANA,RFC4267
-application/sru+xml 'IANA,RFC6207
-application/ssml+xml 'IANA,RFC4267
-application/tamp-apex-update 'IANA,RFC5934
-application/tamp-apex-update-confirm 'IANA,RFC5934
-application/tamp-community-update 'IANA,RFC5934
-application/tamp-community-update-confirm 'IANA,RFC5934
-application/tamp-error 'IANA,RFC5934
-application/tamp-sequence-adjust 'IANA,RFC5934
-application/tamp-sequence-adjust-confirm 'IANA,RFC5934
-application/tamp-status-query 'IANA,RFC5934
-application/tamp-status-response 'IANA,RFC5934
-application/tamp-update 'IANA,RFC5934
-application/tamp-update-confirm 'IANA,RFC5934
-application/tei+xml 'IANA,RFC6129
-application/thraud+xml 'IANA,RFC5941
-application/timestamp-query 'IANA,RFC3161
-application/timestamp-reply 'IANA,RFC3161
-application/timestamped-data 'IANA,RFC5955
-application/tve-trigger 'IANA,[Welsh]
-application/ulpfec 'IANA,RFC5109
-application/vcard+xml 'IANA,RFC6351
-application/vemmi 'IANA,RFC2122
-application/vnd.3gpp.bsf+xml 'IANA,[Meredith]
-application/vnd.3gpp.pic-bw-large 'IANA,[Meredith]
-application/vnd.3gpp.pic-bw-small 'IANA,[Meredith]
-application/vnd.3gpp.pic-bw-var 'IANA,[Meredith]
-application/vnd.3gpp.sms 'IANA,[Meredith]
-application/vnd.3gpp2.bcmcsinfo+xml 'IANA,[Dryden]
-application/vnd.3gpp2.sms 'IANA,[Mahendran]
-application/vnd.3gpp2.tcap 'IANA,[Mahendran]
-application/vnd.3M.Post-it-Notes 'IANA,[O'Brien]
-application/vnd.accpac.simply.aso 'IANA,[Leow]
-application/vnd.accpac.simply.imp 'IANA,[Leow]
-application/vnd.acucobol 'IANA,[Lubin]
-application/vnd.acucorp 'IANA,[Lubin]
-application/vnd.adobe.fxp 'IANA,[Brambley],[Heintz]
-application/vnd.adobe.partial-upload 'IANA,[Otala]
-application/vnd.adobe.xdp+xml 'IANA,[Brinkman]
-application/vnd.adobe.xfdf 'IANA,[Perelman]
-application/vnd.aether.imp 'IANA,[Moskowitz]
-application/vnd.ah-barcode 'IANA,[Ichinose]
-application/vnd.ahead.space 'IANA,[Kristensen]
-application/vnd.airzip.filesecure.azf 'IANA,[Mould],[Clueit]
-application/vnd.airzip.filesecure.azs 'IANA,[Mould],[Clueit]
-application/vnd.americandynamics.acc 'IANA,[Sands]
-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.apple.mpegurl 'IANA,[Singer],[Pantos]
-application/vnd.apple.installer+xml 'IANA,[Bierman]
-application/vnd.arastra.swi (OBSOLETE) 'IANA,[Fenner]
-application/vnd.aristanetworks.swi 'IANA,[Fenner]
-application/vnd.astraea-software.iota 'IANA,[Snazell]
-application/vnd.audiograph 'IANA,[Slusanschi]
-application/vnd.autopackage 'IANA,[Hearn]
-application/vnd.avistar+xml 'IANA,[Vysotsky]
-application/vnd.blueice.multipass 'IANA,[Holmstrom]
-application/vnd.bluetooth.ep.oob 'IANA,[Foley]
-application/vnd.bmi 'IANA,[Gotoh]
-application/vnd.businessobjects 'IANA,[Imoucha]
-application/vnd.cab-jscript 'IANA,[Falkenberg]
-application/vnd.canon-cpdl 'IANA,[Muto]
-application/vnd.canon-lips 'IANA,[Muto]
-application/vnd.cendio.thinlinc.clientconf 'IANA,[Åstrand=Astrand]
-application/vnd.chemdraw+xml 'IANA,[Howes]
-application/vnd.chipnuts.karaoke-mmd 'IANA,[Xiong]
-application/vnd.cinderella 'IANA,[Kortenkamp]
-application/vnd.cirpack.isdn-ext 'IANA,[Mayeux]
-application/vnd.claymore 'IANA,[Simpson]
-application/vnd.cloanto.rp9 'IANA,[Labatt]
-application/vnd.clonk.c4group 'IANA,[Brammer]
-application/vnd.cluetrust.cartomobile-config 'IANA,[Paulsen]
-application/vnd.cluetrust.cartomobile-config-pkg 'IANA,[Paulsen]
-application/vnd.collection+json 'IANA,[Amundsen]
-application/vnd.commerce-battelle 'IANA,[Applebaum]
-application/vnd.commonspace 'IANA,[Chandhok]
-application/vnd.cosmocaller 'IANA,[Dellutri]
-application/vnd.contact.cmsg 'IANA,[Patz]
-application/vnd.crick.clicker 'IANA,[Burt]
-application/vnd.crick.clicker.keyboard 'IANA,[Burt]
-application/vnd.crick.clicker.palette 'IANA,[Burt]
-application/vnd.crick.clicker.template 'IANA,[Burt]
-application/vnd.crick.clicker.wordbank 'IANA,[Burt]
-application/vnd.criticaltools.wbs+xml 'IANA,[Spiller]
-application/vnd.ctc-posml 'IANA,[Kohlhepp]
-application/vnd.ctct.ws+xml 'IANA,[Ancona]
-application/vnd.cups-pdf 'IANA,[Sweet]
-application/vnd.cups-postscript 'IANA,[Sweet]
-application/vnd.cups-ppd 'IANA,[Sweet]
-application/vnd.cups-raster 'IANA,[Sweet]
-application/vnd.cups-raw 'IANA,[Sweet]
-application/vnd.curl 'IANA,[Byrnes]
-application/vnd.cybank 'IANA,[Helmee]
-application/vnd.data-vision.rdz 'IANA,[Fields]
-application/vnd.dece.data 'IANA,[Dolan]
-application/vnd.dece.ttml+xml 'IANA,[Dolan]
-application/vnd.dece.unspecified 'IANA,[Dolan]
-application/vnd.dece.zip 'IANA,[Dolan]
-application/vnd.denovo.fcselayout-link 'IANA,[Dixon]
-application/vnd.dir-bi.plate-dl-nosuffix 'IANA,[Yamanaka]
-application/vnd.dna 'IANA,[Searcy]
-application/vnd.dolby.mobile.1 'IANA,[Hattersley]
-application/vnd.dolby.mobile.2 'IANA,[Hattersley]
-application/vnd.dpgraph 'IANA,[Parker]
-application/vnd.dreamfactory 'IANA,[Appleton]
-application/vnd.dvb.ait 'IANA,[Siebert],[Lagally]
-application/vnd.dvb.dvbj 'IANA,[Siebert],[Lagally]
-application/vnd.dvb.esgcontainer 'IANA,[Heuer]
-application/vnd.dvb.ipdcdftnotifaccess 'IANA,[Yue]
-application/vnd.dvb.ipdcesgaccess 'IANA,[Heuer]
-application/vnd.dvb.ipdcesgaccess2 'IANA,[Marcon]
-application/vnd.dvb.ipdcesgpdd 'IANA,[Marcon]
-application/vnd.dvb.ipdcroaming 'IANA,[Xu]
-application/vnd.dvb.iptv.alfec-base 'IANA,[Henry]
-application/vnd.dvb.iptv.alfec-enhancement 'IANA,[Henry]
-application/vnd.dvb.notif-aggregate-root+xml 'IANA,[Yue]
-application/vnd.dvb.notif-container+xml 'IANA,[Yue]
-application/vnd.dvb.notif-generic+xml 'IANA,[Yue]
-application/vnd.dvb.notif-ia-msglist+xml 'IANA,[Yue]
-application/vnd.dvb.notif-ia-registration-request+xml 'IANA,[Yue]
-application/vnd.dvb.notif-ia-registration-response+xml 'IANA,[Yue]
-application/vnd.dvb.notif-init+xml 'IANA,[Yue]
-application/vnd.dvb.pfr 'IANA,[Siebert],[Lagally]
-application/vnd.dvb.service 'IANA,[Siebert],[Lagally]
-application/vnd.dxr 'IANA,[Duffy]
-application/vnd.dynageo 'IANA,[Mechling]
-application/vnd.easykaraoke.cdgdownload 'IANA,[Downs]
-application/vnd.ecdis-update 'IANA,[Buettgenbach]
-application/vnd.ecowin.chart 'IANA,[Olsson]
-application/vnd.ecowin.filerequest 'IANA,[Olsson]
-application/vnd.ecowin.fileupdate 'IANA,[Olsson]
-application/vnd.ecowin.series 'IANA,[Olsson]
-application/vnd.ecowin.seriesrequest 'IANA,[Olsson]
-application/vnd.ecowin.seriesupdate 'IANA,[Olsson]
-application/vnd.emclient.accessrequest+xml 'IANA,[Navara]
-application/vnd.enliven 'IANA,[Santinelli]
-application/vnd.eprints.data+xml 'IANA,[Brody]
-application/vnd.epson.esf 'IANA,[Hoshina]
-application/vnd.epson.msf 'IANA,[Hoshina]
-application/vnd.epson.quickanime 'IANA,[Gu]
-application/vnd.epson.salt 'IANA,[Nagatomo]
-application/vnd.epson.ssf 'IANA,[Hoshina]
-application/vnd.ericsson.quickcall 'IANA,[Tidwell]
-application/vnd.eszigno3+xml 'IANA,[Tóth=Toth]
-application/vnd.etsi.aoc+xml 'IANA,[Hu]
-application/vnd.etsi.cug+xml 'IANA,[Hu]
-application/vnd.etsi.iptvcommand+xml 'IANA,[Hu]
-application/vnd.etsi.iptvdiscovery+xml 'IANA,[Hu]
-application/vnd.etsi.iptvprofile+xml 'IANA,[Hu]
-application/vnd.etsi.iptvsad-bc+xml 'IANA,[Hu]
-application/vnd.etsi.iptvsad-cod+xml 'IANA,[Hu]
-application/vnd.etsi.iptvsad-npvr+xml 'IANA,[Hu]
-application/vnd.etsi.iptvservice+xml 'IANA,[Ortega]
-application/vnd.etsi.iptvsync+xml 'IANA,[Ortega]
-application/vnd.etsi.iptvueprofile+xml 'IANA,[Hu]
-application/vnd.etsi.mcid+xml 'IANA,[Hu]
-application/vnd.etsi.overload-control-policy-dataset+xml 'IANA,[Ortega]
-application/vnd.etsi.sci+xml 'IANA,[Hu]
-application/vnd.etsi.simservs+xml 'IANA,[Hu]
-application/vnd.etsi.tsl+xml 'IANA,[Hu]
-application/vnd.etsi.tsl.der 'IANA,[Hu]
-application/vnd.eudora.data 'IANA,[Resnick]
-application/vnd.ezpix-album 'IANA,[Electronic Zombie, Corp.]
-application/vnd.ezpix-package 'IANA,[Electronic Zombie, Corp.=ElectronicZombieCorp]
-application/vnd.f-secure.mobile 'IANA,[Sarivaara]
-application/vnd.fdf 'IANA,[Zilles]
-application/vnd.fdsn.mseed 'IANA,[Trabant]
-application/vnd.fdsn.seed 'IANA,[Trabant]
-application/vnd.ffsns 'IANA,[Holstage]
-application/vnd.fints 'IANA,[Hammann]
-application/vnd.FloGraphIt 'IANA,[Floersch]
-application/vnd.fluxtime.clip 'IANA,[Winter]
-application/vnd.font-fontforge-sfd 'IANA,[Williams]
-application/vnd.framemaker 'IANA,[Wexler]
-application/vnd.frogans.fnc 'IANA,[Tamas]
-application/vnd.frogans.ltf 'IANA,[Tamas]
-application/vnd.fsc.weblaunch 'IANA,[D.Smith]
-application/vnd.fujitsu.oasys 'IANA,[Togashi]
-application/vnd.fujitsu.oasys2 'IANA,[Togashi]
-application/vnd.fujitsu.oasys3 'IANA,[Okudaira]
-application/vnd.fujitsu.oasysgp 'IANA,[Sugimoto]
-application/vnd.fujitsu.oasysprs 'IANA,[Ogita]
-application/vnd.fujixerox.ART4 'IANA,[Tanabe]
-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.HBPL 'IANA,[Tanabe]
-application/vnd.fut-misnet 'IANA,[Pruulmann]
-application/vnd.fuzzysheet 'IANA,[Birtwistle]
-application/vnd.genomatix.tuxedo 'IANA,[Frey]
-application/vnd.geocube+xml 'IANA,[Pirsch]
-application/vnd.geogebra.file 'IANA,[GeoGebra],[Kreis]
-application/vnd.geogebra.tool 'IANA,[GeoGebra],[Kreis]
-application/vnd.geometry-explorer 'IANA,[Hvidsten]
-application/vnd.geonext 'IANA,[Ehmann]
-application/vnd.geoplan 'IANA,[Mercat]
-application/vnd.geospace 'IANA,[Mercat]
-application/vnd.globalplatform.card-content-mgt 'IANA,[Bernabeu]
-application/vnd.globalplatform.card-content-mgt-response 'IANA,[Bernabeu]
-application/vnd.gmx (OBSOLETE) 'IANA,[Sciberras]
-application/vnd.google-earth.kml+xml 'IANA,[Ashbridge]
-application/vnd.google-earth.kmz 'IANA,[Ashbridge]
-application/vnd.grafeq 'IANA,[Tupper]
-application/vnd.gridmp 'IANA,[Lawson]
-application/vnd.groove-account 'IANA,[Joseph]
-application/vnd.groove-help 'IANA,[Joseph]
-application/vnd.groove-identity-message 'IANA,[Joseph]
-application/vnd.groove-injector 'IANA,[Joseph]
-application/vnd.groove-tool-message 'IANA,[Joseph]
-application/vnd.groove-tool-template 'IANA,[Joseph]
-application/vnd.groove-vcard 'IANA,[Joseph]
-application/vnd.hal+json 'IANA,[Kelly]
-application/vnd.hal+xml 'IANA,[Kelly]
-application/vnd.HandHeld-Entertainment+xml 'IANA,[Hamilton]
-application/vnd.hbci 'IANA,[Hammann]
-application/vnd.hcl-bireports 'IANA,[Serres]
-application/vnd.hhe.lesson-player 'IANA,[Jones]
-application/vnd.hp-HPGL 'IANA,[Pentecost]
-application/vnd.hp-hpid 'IANA,[Gupta]
-application/vnd.hp-hps 'IANA,[Aubrey]
-application/vnd.hp-jlyt 'IANA,[Gaash]
-application/vnd.hp-PCL 'IANA,[Pentecost]
-application/vnd.hp-PCLXL 'IANA,[Pentecost]
-application/vnd.httphone 'IANA,[Lefevre]
-application/vnd.hydrostatix.sof-data 'IANA,[Gillam]
-application/vnd.hzn-3d-crossword 'IANA,[Minnis]
-application/vnd.ibm.afplinedata 'IANA,[Buis]
-application/vnd.ibm.electronic-media 'IANA,[Tantlinger]
-application/vnd.ibm.MiniPay 'IANA,[Herzberg]
-application/vnd.ibm.modcap 'IANA,[Hohensee]
-application/vnd.ibm.rights-management 'IANA,[Tantlinger]
-application/vnd.ibm.secure-container 'IANA,[Tantlinger]
-application/vnd.iccprofile 'IANA,[Green]
-application/vnd.igloader 'IANA,[Fisher]
-application/vnd.immervision-ivp 'IANA,[Villegas]
-application/vnd.immervision-ivu 'IANA,[Villegas]
-application/vnd.informedcontrol.rms+xml 'IANA,[Wahl]
-application/vnd.infotech.project 'IANA,[Engelke]
-application/vnd.infotech.project+xml 'IANA,[Engelke]
-application/vnd.informix-visionary 'IANA,[Gales]
-application/vnd.insors.igm 'IANA,[Swanson]
-application/vnd.intercon.formnet 'IANA,[Gurak]
-application/vnd.intergeo 'IANA,[Kreis=Kreis2]
-application/vnd.intertrust.digibox 'IANA,[Tomasello]
-application/vnd.intertrust.nncp 'IANA,[Tomasello]
-application/vnd.intu.qbo 'IANA,[Scratchley]
-application/vnd.intu.qfx 'IANA,[Scratchley]
-application/vnd.iptc.g2.conceptitem+xml 'IANA,[Steidl]
-application/vnd.iptc.g2.knowledgeitem+xml 'IANA,[Steidl]
-application/vnd.iptc.g2.newsitem+xml 'IANA,[Steidl]
-application/vnd.iptc.g2.packageitem+xml 'IANA,[Steidl]
-application/vnd.ipunplugged.rcprofile 'IANA,[Ersson]
-application/vnd.irepository.package+xml 'IANA,[Knowles]
-application/vnd.is-xpr 'IANA,[Natarajan]
-application/vnd.isac.fcs 'IANA,[RBrinkman]
-application/vnd.jam 'IANA,[B.Kumar]
-application/vnd.japannet-directory-service 'IANA,[Fujii]
-application/vnd.japannet-jpnstore-wakeup 'IANA,[Yoshitake]
-application/vnd.japannet-payment-wakeup 'IANA,[Fujii]
-application/vnd.japannet-registration 'IANA,[Yoshitake]
-application/vnd.japannet-registration-wakeup 'IANA,[Fujii]
-application/vnd.japannet-setstore-wakeup 'IANA,[Yoshitake]
-application/vnd.japannet-verification 'IANA,[Yoshitake]
-application/vnd.japannet-verification-wakeup 'IANA,[Fujii]
-application/vnd.jcp.javame.midlet-rms 'IANA,[Gorshenev]
-application/vnd.jisp 'IANA,[Deckers]
-application/vnd.joost.joda-archive 'IANA,[Joost]
-application/vnd.kahootz 'IANA,[Macdonald]
-application/vnd.kde.karbon 'IANA,[Faure]
-application/vnd.kde.kchart 'IANA,[Faure]
-application/vnd.kde.kformula 'IANA,[Faure]
-application/vnd.kde.kivio 'IANA,[Faure]
-application/vnd.kde.kontour 'IANA,[Faure]
-application/vnd.kde.kpresenter 'IANA,[Faure]
-application/vnd.kde.kspread 'IANA,[Faure]
-application/vnd.kde.kword 'IANA,[Faure]
-application/vnd.kenameaapp 'IANA,[DiGiorgio-Haag]
-application/vnd.kidspiration 'IANA,[Bennett]
-application/vnd.Kinar 'IANA,[Thakkar]
-application/vnd.koan 'IANA,[Cole]
-application/vnd.kodak-descriptor 'IANA,[Donahue]
-application/vnd.las.las+xml 'IANA,[Bailey=RBailey]
-application/vnd.liberty-request+xml 'IANA,[McDowell]
-application/vnd.llamagraphics.life-balance.desktop 'IANA,[White]
-application/vnd.llamagraphics.life-balance.exchange+xml 'IANA,[White]
-application/vnd.lotus-1-2-3 'IANA,[Wattenberger]
-application/vnd.lotus-approach 'IANA,[Wattenberger]
-application/vnd.lotus-freelance 'IANA,[Wattenberger]
-application/vnd.lotus-notes 'IANA,[Laramie]
-application/vnd.lotus-organizer 'IANA,[Wattenberger]
-application/vnd.lotus-screencam 'IANA,[Wattenberger]
-application/vnd.lotus-wordpro 'IANA,[Wattenberger]
-application/vnd.macports.portpkg 'IANA,[Berry]
-application/vnd.marlin.drm.actiontoken+xml 'IANA,[Ellison]
-application/vnd.marlin.drm.conftoken+xml 'IANA,[Ellison]
-application/vnd.marlin.drm.license+xml 'IANA,[Ellison]
-application/vnd.marlin.drm.mdcf 'IANA,[Ellison]
-application/vnd.mcd 'IANA,[Gotoh]
-application/vnd.medcalcdata 'IANA,[Schoonjans]
-application/vnd.mediastation.cdkey 'IANA,[Flurry]
-application/vnd.meridian-slingshot 'IANA,[Wedel]
-application/vnd.MFER 'IANA,[Hirai]
-application/vnd.mfmp 'IANA,[Ikeda]
-application/vnd.micrografx.flo 'IANA,[Prevo]
-application/vnd.micrografx.igx 'IANA,[Prevo]
-application/vnd.mif 'IANA,[Wexler]
-application/vnd.minisoft-hp3000-save 'IANA,[Bartram]
-application/vnd.mitsubishi.misty-guard.trustweb 'IANA,[Tanaka]
-application/vnd.Mobius.DAF 'IANA,[Kabayama]
-application/vnd.Mobius.DIS 'IANA,[Kabayama]
-application/vnd.Mobius.MBK 'IANA,[Devasia]
-application/vnd.Mobius.MQY 'IANA,[Devasia]
-application/vnd.Mobius.MSL 'IANA,[Kabayama]
-application/vnd.Mobius.PLC 'IANA,[Kabayama]
-application/vnd.Mobius.TXF 'IANA,[Kabayama]
-application/vnd.mophun.application 'IANA,[Wennerstrom]
-application/vnd.mophun.certificate 'IANA,[Wennerstrom]
-application/vnd.motorola.flexsuite 'IANA,[Patton]
-application/vnd.motorola.flexsuite.adsi 'IANA,[Patton]
-application/vnd.motorola.flexsuite.fis 'IANA,[Patton]
-application/vnd.motorola.flexsuite.gotap 'IANA,[Patton]
-application/vnd.motorola.flexsuite.kmr 'IANA,[Patton]
-application/vnd.motorola.flexsuite.ttc 'IANA,[Patton]
-application/vnd.motorola.flexsuite.wem 'IANA,[Patton]
-application/vnd.motorola.iprm 'IANA,[Shamsaasef]
-application/vnd.mozilla.xul+xml 'IANA,[McDaniel]
-application/vnd.ms-artgalry 'IANA,[Slawson]
-application/vnd.ms-asf 'IANA,[Fleischman]
-application/vnd.ms-cab-compressed 'IANA,[Scarborough]
-application/vnd.mseq 'IANA,[Le Bodic]
-application/vnd.ms-excel 'IANA,[Gill]
-application/vnd.ms-excel.addin.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-excel.sheet.binary.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-excel.sheet.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-excel.template.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-fontobject 'IANA,[Scarborough]
-application/vnd.ms-htmlhelp 'IANA,[Techtonik]
-application/vnd.ms-ims 'IANA,[Ledoux]
-application/vnd.ms-lrm 'IANA,[Ledoux]
-application/vnd.ms-office.activeX+xml 'IANA,[Rae]
-application/vnd.ms-officetheme 'IANA,[Rae]
-application/vnd.ms-playready.initiator+xml 'IANA,[Schneider]
-application/vnd.ms-powerpoint 'IANA,[Gill]
-application/vnd.ms-powerpoint.addin.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-powerpoint.presentation.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-powerpoint.slide.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-powerpoint.slideshow.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-powerpoint.template.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-project 'IANA,[Gill]
-application/vnd.ms-tnef 'IANA,[Gill]
-application/vnd.ms-wmdrm.lic-chlg-req 'IANA,[Lau]
-application/vnd.ms-wmdrm.lic-resp 'IANA,[Lau]
-application/vnd.ms-wmdrm.meter-chlg-req 'IANA,[Lau]
-application/vnd.ms-wmdrm.meter-resp 'IANA,[Lau]
-application/vnd.ms-word.document.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-word.template.macroEnabled.12 'IANA,[Rae]
-application/vnd.ms-works 'IANA,[Gill]
-application/vnd.ms-wpl 'IANA,[Plastina]
-application/vnd.ms-xpsdocument 'IANA,[McGatha]
-application/vnd.msign 'IANA,[Borcherding]
-application/vnd.multiad.creator 'IANA,[Mills]
-application/vnd.multiad.creator.cif 'IANA,[Mills]
-application/vnd.musician 'IANA,[Adams]
-application/vnd.music-niff 'IANA,[Butler]
-application/vnd.muvee.style 'IANA,[Anantharamu]
-application/vnd.mynfc 'IANA,[Lefevre]
-application/vnd.ncd.control 'IANA,[Tarkkala]
-application/vnd.ncd.reference 'IANA,[Tarkkala]
-application/vnd.nervana 'IANA,[Judkins]
-application/vnd.netfpx 'IANA,[Mutz]
-application/vnd.neurolanguage.nlu 'IANA,[DuFeu]
-application/vnd.noblenet-directory 'IANA,[Solomon]
-application/vnd.noblenet-sealer 'IANA,[Solomon]
-application/vnd.noblenet-web 'IANA,[Solomon]
-application/vnd.nokia.catalogs 'IANA,[Nokia]
-application/vnd.nokia.conml+wbxml 'IANA,[Nokia]
-application/vnd.nokia.conml+xml 'IANA,[Nokia]
-application/vnd.nokia.iptv.config+xml 'IANA,[Nokia]
-application/vnd.nokia.iSDS-radio-presets 'IANA,[Nokia]
-application/vnd.nokia.landmark+wbxml 'IANA,[Nokia]
-application/vnd.nokia.landmark+xml 'IANA,[Nokia]
-application/vnd.nokia.landmarkcollection+xml 'IANA,[Nokia]
-application/vnd.nokia.ncd 'IANA,[Nokia]
-application/vnd.nokia.n-gage.ac+xml 'IANA,[Nokia]
-application/vnd.nokia.n-gage.data 'IANA,[Nokia]
-application/vnd.nokia.n-gage.symbian.install 'IANA,[Nokia]
-application/vnd.nokia.pcd+wbxml 'IANA,[Nokia]
-application/vnd.nokia.pcd+xml 'IANA,[Nokia]
-application/vnd.nokia.radio-preset 'IANA,[Nokia]
-application/vnd.nokia.radio-presets 'IANA,[Nokia]
-application/vnd.novadigm.EDM 'IANA,[Swenson]
-application/vnd.novadigm.EDX 'IANA,[Swenson]
-application/vnd.novadigm.EXT 'IANA,[Swenson]
-application/vnd.ntt-local.file-transfer 'IANA,[NTT-local]
-application/vnd.ntt-local.sip-ta_remote 'IANA,[NTT-local]
-application/vnd.ntt-local.sip-ta_tcp_stream 'IANA,[NTT-local]
-application/vnd.oasis.opendocument.chart 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.chart-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.database 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.formula 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.formula-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.graphics 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.graphics-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.image 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.image-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.presentation 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.presentation-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.spreadsheet 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.spreadsheet-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.text 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.text-master 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.text-template 'IANA,[Schubert],[OASIS]
-application/vnd.oasis.opendocument.text-web 'IANA,[Schubert],[OASIS]
-application/vnd.obn 'IANA,[Hessling]
-application/vnd.oftn.l10n+json 'IANA,[Grey]
-application/vnd.oipf.contentaccessdownload+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.contentaccessstreaming+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.cspg-hexbinary 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.dae.svg+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.dae.xhtml+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.mippvcontrolmessage+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.pae.gem 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.spdiscovery+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.spdlist+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.ueprofile+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.oipf.userprofile+xml 'IANA,[D'Esclercs=DEsclercs]
-application/vnd.olpc-sugar 'IANA,[Palmieri]
-application/vnd.oma.bcast.associated-procedure-parameter+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.drm-trigger+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.imd+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.ltkm 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.notification+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.provisioningtrigger 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.sgboot 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.sgdd+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.sgdu 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.simple-symbol-container 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.smartcard-trigger+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.sprov+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.bcast.stkm 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.cab-address-book+xml 'IANA,[Wang],[OMA]
-application/vnd.oma.cab-pcc+xml 'IANA,[Wang],[OMA]
-application/vnd.oma.dcd 'IANA,[Primo],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.dcdc 'IANA,[Primo],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.dd2+xml 'IANA,[Sato],[Open Mobile Alliance's BAC DLDRM Working Group]
-application/vnd.oma.drm.risd+xml 'IANA,[Rauschenbach],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.group-usage-list+xml 'IANA,[Kelley],[OMA Presence and Availability (PAG) Working Group]
-application/vnd.oma.pal+xml 'IANA,[McColgan],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.poc.detailed-progress-report+xml 'IANA,[OMA Push to Talk over Cellular (POC) Working Group]
-application/vnd.oma.poc.final-report+xml 'IANA,[OMA Push to Talk over Cellular (POC) Working Group]
-application/vnd.oma.poc.groups+xml 'IANA,[Kelley],[OMA Push to Talk over Cellular (POC) Working Group]
-application/vnd.oma.poc.invocation-descriptor+xml 'IANA,[OMA Push to Talk over Cellular (POC) Working Group]
-application/vnd.oma.poc.optimized-progress-report+xml 'IANA,[OMA Push to Talk over Cellular (POC) Working Group]
-application/vnd.oma.push 'IANA,[Sullivan],[OMA]
-application/vnd.oma.scidm.messages+xml 'IANA,[Zeng],[OMNA - Open Mobile Naming Authority=OMNA-OpenMobileNamingAuthority]
-application/vnd.oma.xcap-directory+xml 'IANA,[Kelley],[OMA Presence and Availability (PAG) Working Group]
-application/vnd.omads-email+xml 'IANA,[OMA Data Synchronization Working Group]
-application/vnd.omads-file+xml 'IANA,[OMA Data Synchronization Working Group]
-application/vnd.omads-folder+xml 'IANA,[OMA Data Synchronization Working Group]
-application/vnd.omaloc-supl-init 'IANA,[Grange]
-application/vnd.oma-scws-config 'IANA,[Mahalal]
-application/vnd.oma-scws-http-request 'IANA,[Mahalal]
-application/vnd.oma-scws-http-response 'IANA,[Mahalal]
-application/vnd.openofficeorg.extension 'IANA,[Lingner]
-application/vnd.openxmlformats-officedocument.custom-properties+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.customXmlProperties+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawing+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawingml.chart+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.extended-properties+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.comments+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.handoutMaster+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.presentation 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.presProps+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slide 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slide+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slideshow 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.slideUpdateInfo+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.tags+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.template 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.template.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.tableSingleCells+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.template 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.volatileDependencies+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.theme+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.themeOverride+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.vmlDrawing 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.document 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.template 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml 'IANA,[Murata]
-application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml 'IANA,[Murata]
-application/vnd.openxmlformats-package.core-properties+xml 'IANA,[Murata]
-application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml 'IANA,[Murata]
-application/vnd.openxmlformats-package.relationships+xml 'IANA,[Murata]
-application/vnd.osa.netdeploy 'IANA,[Klos]
-application/vnd.osgeo.mapguide.package 'IANA,[Birch]
-application/vnd.osgi.bundle 'IANA,[Kriens]
-application/vnd.osgi.dp 'IANA,[Kriens]
-application/vnd.otps.ct-kip+xml 'IANA,[Nyström=Nystrom]
-application/vnd.palm 'IANA,[Peacock]
-application/vnd.paos.xml 'IANA,[Kemp]
-application/vnd.pawaafile 'IANA,[Baskaran]
-application/vnd.pg.format 'IANA,[Gandert]
-application/vnd.pg.osasli 'IANA,[Gandert]
-application/vnd.piaccess.application-licence 'IANA,[Maneos]
-application/vnd.picsel 'IANA,[Naccarato]
-application/vnd.pmi.widget 'IANA,[Lewis]
-application/vnd.poc.group-advertisement+xml 'IANA,[Kelley],[OMA Push to Talk over Cellular (POC) Working Group]
-application/vnd.pocketlearn 'IANA,[Pando]
-application/vnd.powerbuilder6 'IANA,[Guy]
-application/vnd.powerbuilder6-s 'IANA,[Guy]
-application/vnd.powerbuilder7 'IANA,[Shilts]
-application/vnd.powerbuilder75 'IANA,[Shilts]
-application/vnd.powerbuilder75-s 'IANA,[Shilts]
-application/vnd.powerbuilder7-s 'IANA,[Shilts]
-application/vnd.preminet 'IANA,[Tenhunen]
-application/vnd.previewsystems.box 'IANA,[Smolgovsky]
-application/vnd.proteus.magazine 'IANA,[Hoch]
-application/vnd.publishare-delta-tree 'IANA,[Ben-Kiki]
-application/vnd.pvi.ptid1 'IANA,[Lamb]
-application/vnd.pwg-multiplexed 'IANA,RFC3391
-application/vnd.pwg-xhtml-print+xml 'IANA,[Wright]
-application/vnd.qualcomm.brew-app-res 'IANA,[Forrester]
-application/vnd.Quark.QuarkXPress 'IANA,[Scheidler]
-application/vnd.quobject-quoxdocument 'IANA,[Ludwig]
-application/vnd.radisys.moml+xml 'IANA,RFC5707
-application/vnd.radisys.msml-audit-conf+xml 'IANA,RFC5707
-application/vnd.radisys.msml-audit-conn+xml 'IANA,RFC5707
-application/vnd.radisys.msml-audit-dialog+xml 'IANA,RFC5707
-application/vnd.radisys.msml-audit-stream+xml 'IANA,RFC5707
-application/vnd.radisys.msml-audit+xml 'IANA,RFC5707
-application/vnd.radisys.msml-conf+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog-base+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog-fax-detect+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog-fax-sendrecv+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog-group+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog-speech+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog-transform+xml 'IANA,RFC5707
-application/vnd.radisys.msml-dialog+xml 'IANA,RFC5707
-application/vnd.radisys.msml+xml 'IANA,RFC5707
-application/vnd.rainstor.data 'IANA,[Crook]
-application/vnd.rapid 'IANA,[Szekely]
-application/vnd.realvnc.bed 'IANA,[Reeves]
-application/vnd.recordare.musicxml 'IANA,[Good]
-application/vnd.recordare.musicxml+xml 'IANA,[Good]
-application/vnd.RenLearn.rlprint 'IANA,[Wick]
-application/vnd.rig.cryptonote 'IANA,[Jibiki]
-application/vnd.route66.link66+xml 'IANA,[Kikstra]
-application/vnd.ruckus.download 'IANA,[Harris]
-application/vnd.s3sms 'IANA,[Tarkkala]
-application/vnd.sailingtracker.track 'IANA,[Vesalainen]
-application/vnd.sbm.cid 'IANA,[Kusakari]
-application/vnd.sbm.mid2 'IANA,[Murai]
-application/vnd.scribus 'IANA,[Bradney]
-application/vnd.sealed.3df 'IANA,[Kwan]
-application/vnd.sealed.csf 'IANA,[Kwan]
-application/vnd.sealed.doc 'IANA,[Petersen]
-application/vnd.sealed.eml 'IANA,[Petersen]
-application/vnd.sealed.mht 'IANA,[Petersen]
-application/vnd.sealed.net 'IANA,[Lambert]
-application/vnd.sealed.ppt 'IANA,[Petersen]
-application/vnd.sealed.tiff 'IANA,[Kwan],[Lambert]
-application/vnd.sealed.xls 'IANA,[Petersen]
-application/vnd.sealedmedia.softseal.html 'IANA,[Petersen]
-application/vnd.sealedmedia.softseal.pdf 'IANA,[Petersen]
-application/vnd.seemail 'IANA,[Webb]
-application/vnd.sema 'IANA,[Hansson]
-application/vnd.semd 'IANA,[Hansson]
-application/vnd.semf 'IANA,[Hansson]
-application/vnd.shana.informed.formdata 'IANA,[Selzler]
-application/vnd.shana.informed.formtemplate 'IANA,[Selzler]
-application/vnd.shana.informed.interchange 'IANA,[Selzler]
-application/vnd.shana.informed.package 'IANA,[Selzler]
-application/vnd.SimTech-MindMapper 'IANA,[Koh]
-application/vnd.smaf 'IANA,[Takahashi]
-application/vnd.smart.notebook 'IANA,[Neitz]
-application/vnd.smart.teacher 'IANA,[Boyle]
-application/vnd.software602.filler.form+xml 'IANA,[Hytka],[Vondrous]
-application/vnd.software602.filler.form-xml-zip 'IANA,[Hytka],[Vondrous]
-application/vnd.solent.sdkm+xml 'IANA,[Gauntlett]
-application/vnd.spotfire.dxp 'IANA,[Jernberg]
-application/vnd.spotfire.sfs 'IANA,[Jernberg]
-application/vnd.sss-cod 'IANA,[Dani]
-application/vnd.sss-dtf 'IANA,[Bruno]
-application/vnd.sss-ntf 'IANA,[Bruno]
-application/vnd.stepmania.package 'IANA,[Andersson]
-application/vnd.stepmania.stepchart 'IANA,[Andersson]
-application/vnd.street-stream 'IANA,[Levitt]
-application/vnd.sun.wadl+xml 'IANA,[Hadley]
-application/vnd.sus-calendar 'IANA,[Niedfeldt]
-application/vnd.svd 'IANA,[Becker]
-application/vnd.swiftview-ics 'IANA,[Widener]
-application/vnd.syncml.dm.notification 'IANA,[Thompson],[OMA-DM Work Group]
-application/vnd.syncml.dm+wbxml 'IANA,[OMA-DM Work Group]
-application/vnd.syncml.dm+xml 'IANA,[Rao],[OMA-DM Work Group]
-application/vnd.syncml.ds.notification 'IANA,[OMA Data Synchronization Working Group]
-application/vnd.syncml+xml 'IANA,[OMA Data Synchronization Working Group]
-application/vnd.tao.intent-module-archive 'IANA,[Shelton]
-application/vnd.tmobile-livetv 'IANA,[Helin]
-application/vnd.trid.tpt 'IANA,[Cusack]
-application/vnd.triscape.mxs 'IANA,[Simonoff]
-application/vnd.trueapp 'IANA,[Hepler]
-application/vnd.truedoc 'IANA,[Chase]
-application/vnd.ubisoft.webplayer 'IANA,[Talbot]
-application/vnd.ufdl 'IANA,[Manning]
-application/vnd.uiq.theme 'IANA,[Ocock]
-application/vnd.umajin 'IANA,[Riden]
-application/vnd.unity 'IANA,[Unity3d]
-application/vnd.uoml+xml 'IANA,[Gerdes]
-application/vnd.uplanet.alert 'IANA,[Martin]
-application/vnd.uplanet.alert-wbxml 'IANA,[Martin]
-application/vnd.uplanet.bearer-choice 'IANA,[Martin]
-application/vnd.uplanet.bearer-choice-wbxml 'IANA,[Martin]
-application/vnd.uplanet.cacheop 'IANA,[Martin]
-application/vnd.uplanet.cacheop-wbxml 'IANA,[Martin]
-application/vnd.uplanet.channel 'IANA,[Martin]
-application/vnd.uplanet.channel-wbxml 'IANA,[Martin]
-application/vnd.uplanet.list 'IANA,[Martin]
-application/vnd.uplanet.listcmd 'IANA,[Martin]
-application/vnd.uplanet.listcmd-wbxml 'IANA,[Martin]
-application/vnd.uplanet.list-wbxml 'IANA,[Martin]
-application/vnd.uplanet.signal 'IANA,[Martin]
-application/vnd.vcx 'IANA,[T.Sugimoto]
-application/vnd.vd-study 'IANA,[Rogge]
-application/vnd.vectorworks 'IANA,[Ferguson],[Sarkar]
-application/vnd.verimatrix.vcas 'IANA,[Peterka]
-application/vnd.vidsoft.vidconference 'IANA,[Hess]
-application/vnd.visio 'IANA,[Sandal]
-application/vnd.visionary 'IANA,[Aravindakumar]
-application/vnd.vividence.scriptfile 'IANA,[Risher]
-application/vnd.vsf 'IANA,[Rowe]
-application/vnd.wap.sic 'IANA,[WAP-Forum]
-application/vnd.wap.slc 'IANA,[WAP-Forum]
-application/vnd.wap.wbxml 'IANA,[Stark]
-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.wmc 'IANA,[Kjørnes=Kjornes]
-application/vnd.wmf.bootstrap 'IANA,[Nguyenphu],[Iyer]
-application/vnd.wolfram.mathematica 'IANA,[Wolfram]
-application/vnd.wolfram.mathematica.package 'IANA,[Wolfram]
-application/vnd.wolfram.player 'IANA,[Wolfram]
-application/vnd.wordperfect 'IANA,[Scarborough]
-application/vnd.wqd 'IANA,[Bostrom]
-application/vnd.wrq-hp3000-labelled 'IANA,[Bartram]
-application/vnd.wt.stf 'IANA,[Wohler]
-application/vnd.wv.csp+xml 'IANA,[Ingimundarson]
-application/vnd.wv.csp+wbxml 'IANA,[Salmi]
-application/vnd.wv.ssp+xml 'IANA,[Ingimundarson]
-application/vnd.xara 'IANA,[Matthewman]
-application/vnd.xfdl 'IANA,[Manning]
-application/vnd.xfdl.webform 'IANA,[Mansell]
-application/vnd.xmi+xml 'IANA,[Waskiewicz]
-application/vnd.xmpie.cpkg 'IANA,[Sherwin]
-application/vnd.xmpie.dpkg 'IANA,[Sherwin]
-application/vnd.xmpie.plan 'IANA,[Sherwin]
-application/vnd.xmpie.ppkg 'IANA,[Sherwin]
-application/vnd.xmpie.xlim 'IANA,[Sherwin]
-application/vnd.yamaha.hv-dic 'IANA,[Yamamoto]
-application/vnd.yamaha.hv-script 'IANA,[Yamamoto]
-application/vnd.yamaha.hv-voice 'IANA,[Yamamoto]
-application/vnd.yamaha.openscoreformat.osfpvg+xml 'IANA,[Olleson]
-application/vnd.yamaha.openscoreformat 'IANA,[Olleson]
-application/vnd.yamaha.remote-setup 'IANA,[Sukizaki]
-application/vnd.yamaha.smaf-audio 'IANA,[Shinoda]
-application/vnd.yamaha.smaf-phrase 'IANA,[Shinoda]
-application/vnd.yamaha.through-ngn 'IANA,[Sukizaki]
-application/vnd.yamaha.tunnel-udpencap 'IANA,[Sukizaki]
-application/vnd.yellowriver-custom-menu 'IANA,[Yellow]
-application/vnd.zul 'IANA,[Grothmann]
-application/vnd.zzazz.deck+xml 'IANA,[Hewett]
-application/voicexml+xml 'IANA,RFC4267
-application/vq-rtcpxr 'IANA,RFC6035
-application/watcherinfo+xml 'IANA,RFC3858
-application/whoispp-query 'IANA,RFC2957
-application/whoispp-response 'IANA,RFC2958
-application/widget 'IANA,[W3C],[Pemberton]
-application/wita 'IANA,[Campbell]
-application/wordperfect5.1 'IANA,[Lindner]
-application/wsdl+xml 'IANA,[W3C]
-application/wspolicy+xml 'IANA,[W3C]
-application/x400-bp 'IANA,RFC1494
-application/xcap-att+xml 'IANA,RFC4825
-application/xcap-caps+xml 'IANA,RFC4825
-application/xcap-diff+xml 'IANA,RFC5874
-application/xcap-el+xml 'IANA,RFC4825
-application/xcap-error+xml 'IANA,RFC4825
-application/xcap-ns+xml 'IANA,RFC4825
-application/xcon-conference-info-diff+xml 'IANA,{RFC-ietf-xcon-event-package-01.txt=http://tools.ietf.org/html/draft-ietf-xcon-event-package}
-application/xcon-conference-info+xml 'IANA,{RFC-ietf-xcon-event-package-01.txt=http://tools.ietf.org/html/draft-ietf-xcon-event-package}
-application/xenc+xml 'IANA,[Reagle],[XENC Working Group]
-application/xhtml-voice+xml (Obsolete) 'IANA,{RFC-mccobb-xplusv-media-type-04.txt=https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&filename=draft-mccobb-xplusv-media-type}
-application/xhtml+xml 'IANA,RFC3236
-application/xml 'IANA,RFC3023
-application/xml-dtd 'IANA,RFC3023
-application/xml-external-parsed-entity 'IANA,RFC3023
-application/xmpp+xml 'IANA,RFC3923
-application/xop+xml 'IANA,[Nottingham]
-application/xslt+xml 'IANA,[W3C]
-application/xv+xml 'IANA,RFC4374
-application/yang 'IANA,RFC6020
-application/yin+xml 'IANA,RFC6020
-application/zip 'IANA,[Lindner]
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/audio.txt ruby-mime-types-1.25/type-lists/audio.txt
--- ruby-mime-types-1.17.2/type-lists/audio.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/audio.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-audio/1d-interleaved-parityfec 'IANA,RFC6015
-audio/32kadpcm 'IANA,RFC3802,RFC2421
-audio/3gpp 'IANA,RFC3839,RFC6381
-audio/3gpp2 'IANA,RFC4393,RFC6381
-audio/ac3 'IANA,RFC4184
-audio/AMR 'IANA,RFC4867
-audio/AMR-WB 'IANA,RFC4867
-audio/amr-wb+ 'IANA,RFC4352
-audio/asc 'IANA,RFC6295
-audio/ATRAC-ADVANCED-LOSSLESS 'IANA,RFC5584
-audio/ATRAC-X 'IANA,RFC5584
-audio/ATRAC3 'IANA,RFC5584
-audio/basic 'IANA,RFC2045,RFC2046
-audio/BV16 'IANA,RFC4298
-audio/BV32 'IANA,RFC4298
-audio/clearmode 'IANA,RFC4040
-audio/CN 'IANA,RFC3389
-audio/DAT12 'IANA,RFC3190
-audio/dls 'IANA,RFC4613
-audio/dsr-es201108 'IANA,RFC3557
-audio/dsr-es202050 'IANA,RFC4060
-audio/dsr-es202211 'IANA,RFC4060
-audio/dsr-es202212 'IANA,RFC4060
-audio/eac3 'IANA,RFC4598
-audio/DVI4 'IANA,RFC4856
-audio/EVRC 'IANA,RFC4788
-audio/EVRC0 'IANA,RFC4788
-audio/EVRC1 'IANA,RFC4788
-audio/EVRCB 'IANA,RFC5188
-audio/EVRCB0 'IANA,RFC5188
-audio/EVRCB1 'IANA,RFC4788
-audio/EVRC-QCP 'IANA,RFC3625
-audio/EVRCWB 'IANA,RFC5188
-audio/EVRCWB0 'IANA,RFC5188
-audio/EVRCWB1 'IANA,RFC5188
-audio/example 'IANA,RFC4735
-audio/fwdred 'IANA,RFC6354
-audio/G719 'IANA,RFC5404
-audio/G722 'IANA,RFC4856
-audio/G7221 'IANA,RFC5577
-audio/G723 'IANA,RFC4856
-audio/G726-16 'IANA,RFC4856
-audio/G726-24 'IANA,RFC4856
-audio/G726-32 'IANA,RFC4856
-audio/G726-40 'IANA,RFC4856
-audio/G728 'IANA,RFC4856
-audio/G729 'IANA,RFC4856
-audio/G7291 'IANA,RFC4749,RFC5459
-audio/G729D 'IANA,RFC4856
-audio/G729E 'IANA,RFC4856
-audio/GSM 'IANA,RFC4856
-audio/GSM-EFR 'IANA,RFC4856
-audio/GSM-HR-08 'IANA,RFC5993
-audio/iLBC 'IANA,RFC3952
-audio/ip-mr_v2.5 'IANA,RFC6262
-audio/L8 'IANA,RFC4856
-audio/L16 'IANA,RFC4856
-audio/L20 'IANA,RFC3190
-audio/L24 'IANA,RFC3190
-audio/LPC 'IANA,RFC4856
-audio/mobile-xmf 'IANA,RFC4723
-audio/MPA 'IANA,RFC3555
-audio/mp4 'IANA,RFC4337,RFC6381
-audio/MP4A-LATM 'IANA,RFC6416
-audio/mpa-robust 'IANA,RFC5219
-audio/mpeg 'IANA,RFC3003
-audio/mpeg4-generic 'IANA,RFC3640,RFC5691,RFC6295
-audio/ogg 'IANA,RFC5334
-audio/parityfec 'IANA,RFC5109
-audio/PCMA 'IANA,RFC4856
-audio/PCMA-WB 'IANA,RFC5391
-audio/PCMU 'IANA,RFC4856
-audio/PCMU-WB 'IANA,RFC5391
-audio/prs.sid 'IANA,[Walleij]
-audio/QCELP 'IANA,RFC3555,RFC3625
-audio/RED 'IANA,RFC3555
-audio/rtp-enc-aescm128 'IANA,[3GPP]
-audio/rtp-midi 'IANA,RFC6295
-audio/rtx 'IANA,RFC4588
-audio/SMV 'IANA,RFC3558
-audio/SMV0 'IANA,RFC3558
-audio/SMV-QCP 'IANA,RFC3625
-audio/sp-midi 'IANA,[Kosonen],[T. White=T.White]
-audio/speex 'IANA,RFC5574
-audio/t140c 'IANA,RFC4351
-audio/t38 'IANA,RFC4612
-audio/telephone-event 'IANA,RFC4733
-audio/tone 'IANA,RFC4733
-audio/UEMCLIP 'IANA,RFC5686
-audio/ulpfec 'IANA,RFC5109
-audio/VDVI 'IANA,RFC4856
-audio/VMR-WB 'IANA,RFC4348,RFC4424
-audio/vnd.3gpp.iufp 'IANA,[Belling]
-audio/vnd.4SB 'IANA,[De Jaham]
-audio/vnd.audiokoz 'IANA,[DeBarros]
-audio/vnd.CELP 'IANA,[De Jaham]
-audio/vnd.cisco.nse 'IANA,[Kumar]
-audio/vnd.cmles.radio-events 'IANA,[Goulet]
-audio/vnd.cns.anp1 'IANA,[McLaughlin]
-audio/vnd.cns.inf1 'IANA,[McLaughlin]
-audio/vnd.dece.audio 'IANA,[Dolan]
-audio/vnd.digital-winds 'IANA,[Strazds]
-audio/vnd.dlna.adts 'IANA,[Heredia]
-audio/vnd.dolby.heaac.1 'IANA,[Hattersley]
-audio/vnd.dolby.heaac.2 'IANA,[Hattersley]
-audio/vnd.dolby.mlp 'IANA,[Ward]
-audio/vnd.dolby.mps 'IANA,[Hattersley]
-audio/vnd.dolby.pl2 'IANA,[Hattersley]
-audio/vnd.dolby.pl2x 'IANA,[Hattersley]
-audio/vnd.dolby.pl2z 'IANA,[Hattersley]
-audio/vnd.dolby.pulse.1 'IANA,[Hattersley]
-audio/vnd.dra 'IANA,[Tian]
-audio/vnd.dts 'IANA,[Zou]
-audio/vnd.dts.hd 'IANA,[Zou]
-audio/vnd.dvb.file 'IANA,[Siebert]
-audio/vnd.everad.plj 'IANA,[Cicelsky]
-audio/vnd.hns.audio 'IANA,[Swaminathan]
-audio/vnd.lucent.voice 'IANA,[Vaudreuil]
-audio/vnd.ms-playready.media.pya 'IANA,[DiAcetis]
-audio/vnd.nokia.mobile-xmf 'IANA,[Nokia Corporation=Nokia]
-audio/vnd.nortel.vbk 'IANA,[Parsons]
-audio/vnd.nuera.ecelp4800 'IANA,[Fox]
-audio/vnd.nuera.ecelp7470 'IANA,[Fox]
-audio/vnd.nuera.ecelp9600 'IANA,[Fox]
-audio/vnd.octel.sbc 'IANA,[Vaudreuil]
-audio/vnd.qcelp - DEPRECATED - Please use audio/qcelp 'IANA,RFC3625
-audio/vnd.rhetorex.32kadpcm 'IANA,[Vaudreuil]
-audio/vnd.rip 'IANA,[Dawe]
-audio/vnd.sealedmedia.softseal.mpeg 'IANA,[Petersen]
-audio/vnd.vmx.cvsd 'IANA,[Vaudreuil]
-audio/vorbis 'IANA,RFC5215
-audio/vorbis-config 'IANA,RFC5215
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/image.txt ruby-mime-types-1.25/type-lists/image.txt
--- ruby-mime-types-1.17.2/type-lists/image.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/image.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-image/cgm 'IANA,[Francis]
-image/example 'IANA,RFC4735
-image/fits 'IANA,RFC4047
-image/g3fax 'IANA,RFC1494
-image/gif 'IANA,RFC2045,RFC2046
-image/ief 'IANA,RFC1314
-image/jp2 'IANA,RFC3745
-image/jpeg 'IANA,RFC2045,RFC2046
-image/jpm 'IANA,RFC3745
-image/jpx 'IANA,RFC3745
-image/ktx 'IANA,[Callow],[Khronos]
-image/naplps 'IANA,[Ferber]
-image/png 'IANA,[Randers-Pehrson]
-image/prs.btif 'IANA,[Simon]
-image/prs.pti 'IANA,[Laun]
-image/svg+xml 'IANA,[W3C]
-image/t38 'IANA,RFC3362
-image/tiff 'IANA,RFC2302
-image/tiff-fx 'IANA,RFC3950
-image/vnd.adobe.photoshop 'IANA,[Scarborough]
-image/vnd.cns.inf2 'IANA,[McLaughlin]
-image/vnd.dece.graphic 'IANA,[Dolan]
-image/vnd.djvu 'IANA,[Bottou]
-image/vnd.dwg 'IANA,[Moline]
-image/vnd.dxf 'IANA,[Moline]
-image/vnd.dvb.subtitle 'IANA,[Siebert],[Lagally]
-image/vnd.fastbidsheet 'IANA,[Becker]
-image/vnd.fpx 'IANA,[Spencer]
-image/vnd.fst 'IANA,[Fuldseth]
-image/vnd.fujixerox.edmics-mmr 'IANA,[Onda]
-image/vnd.fujixerox.edmics-rlc 'IANA,[Onda]
-image/vnd.globalgraphics.pgb 'IANA,[Bailey]
-image/vnd.microsoft.icon 'IANA,[Butcher]
-image/vnd.mix 'IANA,[Reddy]
-image/vnd.ms-modi 'IANA,[Vaughan]
-image/vnd.net-fpx 'IANA,[Spencer]
-image/vnd.radiance 'IANA,[Fritz],[GWard]
-image/vnd.sealed.png 'IANA,[Petersen]
-image/vnd.sealedmedia.softseal.gif 'IANA,[Petersen]
-image/vnd.sealedmedia.softseal.jpg 'IANA,[Petersen]
-image/vnd.svf 'IANA,[Moline]
-image/vnd.wap.wbmp 'IANA,[Stark]
-image/vnd.xiff 'IANA,[S.Martin]
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/message.txt ruby-mime-types-1.25/type-lists/message.txt
--- ruby-mime-types-1.17.2/type-lists/message.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/message.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-message/CPIM 'IANA,RFC3862
-message/delivery-status 'IANA,RFC1894
-message/disposition-notification 'IANA,RFC3798
-message/example 'IANA,RFC4735
-message/external-body 'IANA,RFC2045,RFC2046
-message/feedback-report 'IANA,RFC5965
-message/global 'IANA,RFC5335
-message/global-delivery-status 'IANA,RFC5337
-message/global-disposition-notification 'IANA,RFC5337
-message/global-headers 'IANA,RFC5337
-message/http 'IANA,RFC2616
-message/imdn+xml 'IANA,RFC5438
-message/news (OBSOLETE) 'IANA,RFC5537,[H.Spencer]
-message/partial 'IANA,RFC2045,RFC2046
-message/rfc822 'IANA,RFC2045,RFC2046
-message/s-http 'IANA,RFC2660
-message/sip 'IANA,RFC3261
-message/sipfrag 'IANA,RFC3420
-message/tracking-status 'IANA,RFC3886
-message/vnd.si.simp 'IANA,[Parks Young=ParksYoung]
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/model.txt ruby-mime-types-1.25/type-lists/model.txt
--- ruby-mime-types-1.17.2/type-lists/model.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/model.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-model/example 'IANA,RFC4735
-model/iges 'IANA,[Parks]
-model/mesh 'IANA,RFC2077
-model/vnd.collada+xml 'IANA,[Riordon]
-model/vnd.dwf 'IANA,[Pratt]
-model/vnd.flatland.3dml 'IANA,[Powers]
-model/vnd.gdl 'IANA,[Babits]
-model/vnd.gs-gdl 'IANA,[Babits]
-model/vnd.gtw 'IANA,[Ozaki]
-model/vnd.moml+xml 'IANA,[Brooks]
-model/vnd.mts 'IANA,[Rabinovitch]
-model/vnd.parasolid.transmit.binary 'IANA,[Parasolid]
-model/vnd.parasolid.transmit.text 'IANA,[Parasolid]
-model/vnd.vtu 'IANA,[Rabinovitch]
-model/vrml 'IANA,RFC2077
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/multipart.txt ruby-mime-types-1.25/type-lists/multipart.txt
--- ruby-mime-types-1.17.2/type-lists/multipart.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/multipart.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-multipart/alternative 'IANA,RFC2045,RFC2046
-multipart/appledouble 'IANA,[Faltstrom]
-multipart/byteranges 'IANA,RFC2616
-multipart/digest 'IANA,RFC2045,RFC2046
-multipart/encrypted 'IANA,RFC1847
-multipart/example 'IANA,RFC4735
-multipart/form-data 'IANA,RFC2388
-multipart/header-set 'IANA,[Crocker]
-multipart/mixed 'IANA,RFC2045,RFC2046
-multipart/parallel 'IANA,RFC2045,RFC2046
-multipart/related 'IANA,RFC2387
-multipart/report 'IANA,RFC3462
-multipart/signed 'IANA,RFC1847
-multipart/voice-message 'IANA,RFC2421,RFC2423
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/text.txt ruby-mime-types-1.25/type-lists/text.txt
--- ruby-mime-types-1.17.2/type-lists/text.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/text.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-text/1d-interleaved-parityfec 'IANA,RFC6015
-text/calendar 'IANA,RFC5545
-text/css 'IANA,RFC2318
-text/csv 'IANA,RFC4180
-text/directory (deprecated) 'IANA,RFC2425,RFC6350
-text/dns 'IANA,RFC4027
-text/ecmascript (obsolete) 'IANA,RFC4329
-text/enriched 'IANA,RFC1896
-text/example 'IANA,RFC4735
-text/fwdred 'IANA,RFC6354
-text/javascript (obsolete) 'IANA,RFC4329
-text/n3 'IANA,[Prud'hommeaux=Prudhommeaux],[W3C]
-text/parityfec 'IANA,RFC5109
-text/plain 'IANA,RFC2046,RFC3676,RFC5147
-text/prs.fallenstein.rst 'IANA,[Fallenstein]
-text/prs.lines.tag 'IANA,[Lines]
-text/RED 'IANA,RFC4102
-text/rfc822-headers 'IANA,RFC3462
-text/richtext 'IANA,RFC2045,RFC2046
-text/rtf 'IANA,[Lindner]
-text/rtp-enc-aescm128 'IANA,[3GPP]
-text/rtx 'IANA,RFC4588
-text/sgml 'IANA,RFC1874
-text/t140 'IANA,RFC4103
-text/tab-separated-values 'IANA,[Lindner]
-text/troff 'IANA,RFC4263
-text/turtle 'IANA,[Prud'hommeaux=Prudhommeaux],[W3C]
-text/uri-list 'IANA,RFC2483
-text/vcard 'IANA,RFC6350
-text/vnd.abc 'IANA,[Allen]
-text/vnd.curl 'IANA,[Byrnes]
-text/vnd.DMClientScript 'IANA,[Bradley]
-text/vnd.dvb.subtitle 'IANA,[Siebert],[Lagally]
-text/vnd.esmertec.theme-descriptor 'IANA,[Eilemann]
-text/vnd.fly 'IANA,[Gurney]
-text/vnd.fmi.flexstor 'IANA,[Hurtta]
-text/vnd.graphviz 'IANA,[Ellson]
-text/vnd.in3d.3dml 'IANA,[Powers]
-text/vnd.in3d.spot 'IANA,[Powers]
-text/vnd.IPTC.NewsML 'IANA,[IPTC
- =IPTC]
-text/vnd.IPTC.NITF 'IANA,[IPTC
- =IPTC]
-text/vnd.latex-z 'IANA,[Lubos]
-text/vnd.motorola.reflex 'IANA,[Patton]
-text/vnd.ms-mediapackage 'IANA,[Nelson]
-text/vnd.net2phone.commcenter.command 'IANA,[Xie]
-text/vnd.radisys.msml-basic-layout 'IANA,RFC5707
-text/vnd.si.uricatalogue 'IANA,[Parks Young=ParksYoung]
-text/vnd.sun.j2me.app-descriptor 'IANA,[G.Adams]
-text/vnd.trolltech.linguist 'IANA,[D.Lambert]
-text/vnd.wap.si 'IANA,[WAP-Forum]
-text/vnd.wap.sl 'IANA,[WAP-Forum]
-text/vnd.wap.wml 'IANA,[Stark]
-text/vnd.wap.wmlscript 'IANA,[Stark]
-text/xml 'IANA,RFC3023
-text/xml-external-parsed-entity 'IANA,RFC3023
\ No newline at end of file
diff -Nru ruby-mime-types-1.17.2/type-lists/video.txt ruby-mime-types-1.25/type-lists/video.txt
--- ruby-mime-types-1.17.2/type-lists/video.txt 2011-12-15 12:37:47.000000000 +0000
+++ ruby-mime-types-1.25/type-lists/video.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-video/1d-interleaved-parityfec 'IANA,RFC6015
-video/3gpp 'IANA,RFC3839,RFC6381
-video/3gpp2 'IANA,RFC4393,RFC6381
-video/3gpp-tt 'IANA,RFC4396
-video/BMPEG 'IANA,RFC3555
-video/BT656 'IANA,RFC3555
-video/CelB 'IANA,RFC3555
-video/DV 'IANA,RFC3189
-video/example 'IANA,RFC4735
-video/H261 'IANA,RFC4587
-video/H263 'IANA,RFC3555
-video/H263-1998 'IANA,RFC4629
-video/H263-2000 'IANA,RFC4629
-video/H264 'IANA,RFC6184
-video/H264-RCDO 'IANA,RFC6185
-video/H264-SVC 'IANA,RFC6190
-video/JPEG 'IANA,RFC3555
-video/jpeg2000 'IANA,RFC5371,RFC5372
-video/MJ2 'IANA,RFC3745
-video/MP1S 'IANA,RFC3555
-video/MP2P 'IANA,RFC3555
-video/MP2T 'IANA,RFC3555
-video/mp4 'IANA,RFC4337,RFC6381
-video/MP4V-ES 'IANA,RFC6416
-video/MPV 'IANA,RFC3555
-video/mpeg 'IANA,RFC2045,RFC2046
-video/mpeg4-generic 'IANA,RFC3640
-video/nv 'IANA,RFC4856
-video/ogg 'IANA,RFC5334
-video/parityfec 'IANA,RFC5109
-video/pointer 'IANA,RFC2862
-video/quicktime 'IANA,RFC6381,[Lindner]
-video/raw 'IANA,RFC4175
-video/rtp-enc-aescm128 'IANA,[3GPP]
-video/rtx 'IANA,RFC4588
-video/SMPTE292M 'IANA,RFC3497
-video/ulpfec 'IANA,RFC5109
-video/vc1 'IANA,RFC4425
-video/vnd.CCTV 'IANA,[Rottmann]
-video/vnd.dece.hd 'IANA,[Dolan]
-video/vnd.dece.mobile 'IANA,[Dolan]
-video/vnd.dece.mp4 'IANA,[Dolan]
-video/vnd.dece.pd 'IANA,[Dolan]
-video/vnd.dece.sd 'IANA,[Dolan]
-video/vnd.dece.video 'IANA,[Dolan]
-video/vnd.directv.mpeg 'IANA,[Zerbe]
-video/vnd.dvb.file 'IANA,[Siebert],[Murray]
-video/vnd.hns.video 'IANA,[Swaminathan]
-video/vnd.iptvforum.1dparityfec-1010 'IANA,[Nakamura]
-video/vnd.iptvforum.1dparityfec-2005 'IANA,[Nakamura]
-video/vnd.iptvforum.2dparityfec-1010 'IANA,[Nakamura]
-video/vnd.iptvforum.2dparityfec-2005 'IANA,[Nakamura]
-video/vnd.iptvforum.ttsavc 'IANA,[Nakamura]
-video/vnd.iptvforum.ttsmpeg2 'IANA,[Nakamura]
-video/vnd.motorola.video 'IANA,[McGinty]
-video/vnd.motorola.videop 'IANA,[McGinty]
-video/vnd.mpegurl 'IANA,[Recktenwald]
-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.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