Merge branch 'dbmercer-patch-1' of git://github.com/dbmercer/cowboy.git

ninenines · Oct 11, 2012 · 7b3d994 · 7b3d994
2 parents 642a8f7 + b5fdf02
commit 7b3d994
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/examples/static/rebar.config b/examples/static/rebar.config
@@ -1,4 +1,6 @@
 {deps, [
 	{cowboy, ".*",
-		{git, "git://github.com/extend/cowboy.git", "master"}}
+		{git, "git://github.com/extend/cowboy.git", "master"}},
+	{mimetypes, ".*",
+		{git, "git://github.com/spawngrid/mimetypes.git", "master"}}
 ]}.
diff --git a/examples/static/src/static_app.erl b/examples/static/src/static_app.erl
@@ -14,7 +14,8 @@ start(_Type, _Args) ->
 	Dispatch = [
 		{'_', [
 			{['...'], cowboy_static, [
-				{directory, {priv_dir, static, []}}
+				{directory, {priv_dir, static, []}},
+				{mimetypes, {fun mimetypes:path_to_mimes/2, default}}
 			]} 
 		]}
 	],