Merge pull request #68 from JuliaWeb/rd/mime

Port MIME type detection over from HttpServer.jl
JuliaWeb · Aug 22, 2018 · 7fdabed · 7fdabed
2 parents 962b54f + 4bbd9e5
commit 7fdabed
Show file tree

Hide file tree

Showing 4 changed files with 1,017 additions and 3 deletions.
diff --git a/src/Mux.jl b/src/Mux.jl
@@ -27,6 +27,7 @@ include("routing.jl")
 
 include("websockets_integration.jl")
 
+include("examples/mimetypes.jl")
 include("examples/basic.jl")
 include("examples/files.jl")
 

diff --git a/src/examples/files.jl b/src/examples/files.jl
@@ -11,10 +11,9 @@ function validpath(root, path; dirs = true)
     (isfile(full) || (dirs && isdir(full)))
 end
 
-ormatch(r::RegexMatch, x) = r.match
-ormatch(r::Nothing, x) = x
+extension(f) = last(splitext(f))[2:end]
 
-fileheaders(f) = d("Content-Type" => "application/octet-stream") # TODO: switch to using HTTP.sniff
+fileheaders(f) = d("Content-Type" => get(mimetypes, extension(f), "application/octet-stream"))
 
 fileresponse(f) = d(:file => f,
                     :body => read(f),