github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #48698 from sakeven/remove_mime 

Automatic merge from submit-queue

remove svg mime type extension

Signed-off-by: sakeven <jc5930@sina.cn>



**What this PR does / why we need it**:

I found that [kubernetes requires go version 1.6 or greater](https://github.com/kubernetes/kubernetes/blob/master/hack/lib/golang.sh#L335).
While the [commit](21e47d831b)  which adds "image/svg+xml" type for extension ".svg", has been merged to go from version 1.5 to 1.9beta.

So it's safe to remove code ```mime.AddExtensionType(".svg", "image/svg+xml")```.

**Special notes for your reviewer**:

**Release note**:

```
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-07-12 04:50:02 -07:00 committed by GitHub
parent 3ade1a155d 795953c0c4
commit 69dff8b943
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View File

@ -18,7 +18,6 @@ package server
import ( import (
"fmt" "fmt"
"mime"
"net/http" "net/http"
"strings" "strings"
"sync" "sync"
@ -223,13 +222,6 @@ func (s emptyDelegate) OpenAPISpec() *spec.Swagger {
return nil return nil
} }
func init() {
// Send correct mime type for .svg files.
// TODO: remove when https://github.com/golang/go/commit/21e47d831bafb59f22b1ea8098f709677ec8ce33
// makes it into all of our supported go versions (only in v1.7.1 now).
mime.AddExtensionType(".svg", "image/svg+xml")
}
// RequestContextMapper is exposed so that third party resource storage can be build in a different location. // RequestContextMapper is exposed so that third party resource storage can be build in a different location.
// TODO refactor third party resource storage // TODO refactor third party resource storage
func (s *GenericAPIServer) RequestContextMapper() apirequest.RequestContextMapper { func (s *GenericAPIServer) RequestContextMapper() apirequest.RequestContextMapper {