~ubuntu-branches/ubuntu/trusty/nginx/trusty-proposed

« back to all changes in this revision

Viewing changes to conf/mime.types

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry
  • Date: 2013-04-25 12:51:45 UTC
  • mfrom: (1.3.28)
  • mto: (1.3.29) (15.1.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: package-import@ubuntu.com-20130425125145-ugl0wor6bq0u5eae
Tags: upstream-1.4.0
ImportĀ upstreamĀ versionĀ 1.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
types {
3
3
    text/html                             html htm shtml;
4
4
    text/css                              css;
5
 
    text/xml                              xml rss;
 
5
    text/xml                              xml;
6
6
    image/gif                             gif;
7
7
    image/jpeg                            jpeg jpg;
8
8
    application/x-javascript              js;
9
9
    application/atom+xml                  atom;
 
10
    application/rss+xml                   rss;
10
11
 
11
12
    text/mathml                           mml;
12
13
    text/plain                            txt;
20
21
    image/x-icon                          ico;
21
22
    image/x-jng                           jng;
22
23
    image/x-ms-bmp                        bmp;
23
 
    image/svg+xml                         svg;
 
24
    image/svg+xml                         svg svgz;
 
25
    image/webp                            webp;
24
26
 
25
27
    application/java-archive              jar war ear;
26
28
    application/mac-binhex40              hqx;
31
33
    application/vnd.ms-excel              xls;
32
34
    application/vnd.ms-powerpoint         ppt;
33
35
    application/vnd.wap.wmlc              wmlc;
34
 
    application/vnd.wap.xhtml+xml         xhtml;
 
36
    application/vnd.google-earth.kml+xml  kml;
 
37
    application/vnd.google-earth.kmz      kmz;
 
38
    application/x-7z-compressed           7z;
35
39
    application/x-cocoa                   cco;
36
40
    application/x-java-archive-diff       jardiff;
37
41
    application/x-java-jnlp-file          jnlp;
46
50
    application/x-tcl                     tcl tk;
47
51
    application/x-x509-ca-cert            der pem crt;
48
52
    application/x-xpinstall               xpi;
 
53
    application/xhtml+xml                 xhtml;
49
54
    application/zip                       zip;
50
55
 
51
56
    application/octet-stream              bin exe dll;
57
62
 
58
63
    audio/midi                            mid midi kar;
59
64
    audio/mpeg                            mp3;
 
65
    audio/ogg                             ogg;
 
66
    audio/x-m4a                           m4a;
60
67
    audio/x-realaudio                     ra;
61
68
 
62
69
    video/3gpp                            3gpp 3gp;
 
70
    video/mp4                             mp4;
63
71
    video/mpeg                            mpeg mpg;
64
72
    video/quicktime                       mov;
 
73
    video/webm                            webm;
65
74
    video/x-flv                           flv;
 
75
    video/x-m4v                           m4v;
66
76
    video/x-mng                           mng;
67
77
    video/x-ms-asf                        asx asf;
68
78
    video/x-ms-wmv                        wmv;