diff options
| author | Jérémy Bobbio <lunar@debian.org> | 2013-10-16 11:12:28 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-12-13 16:40:22 +0100 |
| commit | 4f33cfd52a4a794f9dfeb2e53b788780d5d3f1c5 (patch) | |
| tree | 1a2a8f5eea398cf3c3bc104ae5849ca05a3c99e5 /tests | |
| parent | fe0ce0f210bdd39bcba1d6301e535ab29fc94b91 (diff) | |
Do not recognize all .asc files as application/pgp-encrypted
The change introduced in 2c3438c had the unfortunate effect of having all .asc
be identified as application/pgp-encrypted. As this should only happen when
we can identify armor headers, we now give a lower weight than text/plain to
the *.asc glob for OpenPGP MIME types.
https://bugs.freedesktop.org/show_bug.cgi?id=70539
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/list | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -446,9 +446,10 @@ nrl.trig application/x-trig oxo # Copied from http://git.savannah.gnu.org/cgit/gnash.git/plain/testsuite/samples/subshapes.swf subshapes.swf application/vnd.adobe.flash.movie -COPYING-encrypted.asc application/pgp-encrypted ooo +COPYING-encrypted.asc application/pgp-encrypted xoo # clear text signatures should not have the same mime type as detached signatures COPYING-clearsign.asc application/pgp-signature xxx +COPYING-clearsign.asc application/pgp-keys xxx COPYING.asc application/pgp-signature xoo test-public-key.asc application/pgp-keys xoo test-secret-key.skr application/pgp-keys ooo |