From 41b3dc1b339fe35d49c36aad1e524a5bcc0cd90c Mon Sep 17 00:00:00 2001 From: Mathias Bynens Date: Wed, 21 Mar 2012 08:49:21 +0100 Subject: [PATCH 1/2] Serve .mp4 and .m4v files as `video/mp4` as per RFC 4337 Closes h5bp/html5-boilerplate#1024. See http://tools.ietf.org/html/rfc4337#section-2. --- nginx-mime.types | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-mime.types b/nginx-mime.types index 9c2a725..2b3fc26 100644 --- a/nginx-mime.types +++ b/nginx-mime.types @@ -76,12 +76,12 @@ types { audio/x-wav wav; video/3gpp 3gpp 3gp; + video/mp4 m4v mp4; video/mpeg mpeg mpg; video/ogg ogv; video/quicktime mov; video/webm webm; video/x-flv flv; - video/x-m4v m4v; video/x-mng mng; video/x-ms-asf asx asf; video/x-ms-wmv wmv; From 55692f2b23338b0c4186b853080f820fd745cf9e Mon Sep 17 00:00:00 2001 From: Indrek Ardel Date: Sun, 25 Mar 2012 21:20:29 +0300 Subject: [PATCH 2/2] Fix configuration syntax. http://wiki.nginx.org/ConfigurationSyntax --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index b9c5ddb..6adc6ca 100644 --- a/nginx.conf +++ b/nginx.conf @@ -136,7 +136,7 @@ http { # CSS and Javascript location ~* \.(?:css|js)$ { - expires 1Y; + expires 1y; access_log off; add_header Cache-Control "public"; }