From: Andy Williams <andy@andy.xyz>
Date: Fri, 5 Jun 2020 10:18:47 +0000 (+0000)
Subject: mime: look up mime types on Arch Linux
X-Git-Tag: go1.16beta1~487
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ece7a33386a4fbd2ff9859902f780ed82120b985;p=gostls13.git

mime: look up mime types on Arch Linux

Some systems use "httpd" directory structure instead of "apache"

Change-Id: I77600baf356f0c0c3359b331505b0426112daebb
GitHub-Last-Rev: c64766f88cc28899d3d387e3eebfa4fcc3eef808
GitHub-Pull-Request: golang/go#39416
Reviewed-on: https://go-review.googlesource.com/c/go/+/236677
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Trust: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/mime/type_unix.go b/src/mime/type_unix.go
index 0b247b623a..3a25002842 100644
--- a/src/mime/type_unix.go
+++ b/src/mime/type_unix.go
@@ -20,6 +20,7 @@ var typeFiles = []string{
 	"/etc/mime.types",
 	"/etc/apache2/mime.types",
 	"/etc/apache/mime.types",
+	"/etc/httpd/conf/mime.types",
 }
 
 func loadMimeFile(filename string) {