Merge pull request #43 from basecamp/revert-42-revert-38-lb/support-application-xdirectory-content-type

lewispb · web-flow · commit 823b3ef6eb21 · 2022-07-20T14:34:05.000+01:00
Support application xdirectory content type
diff --git a/imageproxy.go b/imageproxy.go
@@ -274,7 +274,7 @@ func (p *Proxy) serveImage(w http.ResponseWriter, r *http.Request) {
 }
 
 func isInvalidContentType(contentType string) bool {
-	return contentType == "" || contentType == "application/octet-stream" || contentType == "binary/octet-stream" || !strings.Contains(contentType, "/")
+	return contentType == "" || contentType == "application/octet-stream" || contentType == "application/x-directory" || contentType == "binary/octet-stream" || !strings.Contains(contentType, "/")
 }
 
 // peekContentType peeks at the first 512 bytes of p, and attempts to detect

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ func (p Proxy) serveImage(w http.ResponseWriter, r http.Request) {`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`func isInvalidContentType(contentType string) bool {`
`277`		`- return contentType == "" \|\| contentType == "application/octet-stream" \|\| contentType == "binary/octet-stream" \|\| !strings.Contains(contentType, "/")`
	`277`	`+ return contentType == "" \|\| contentType == "application/octet-stream" \|\| contentType == "application/x-directory" \|\| contentType == "binary/octet-stream" \|\| !strings.Contains(contentType, "/")`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`// peekContentType peeks at the first 512 bytes of p, and attempts to detect`