diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:54:22 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:54:22 -0400 |
| commit | e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5 (patch) | |
| tree | 746b1ab1ab5626fb20ddd04121c29a951a6f84b3 /modules | |
| parent | eeb793524f2da4afdca017b585d9cfb6e9628e85 (diff) | |
| parent | 94ac5ebb9f100c77da02b56961119a25cd9e6d20 (diff) | |
| download | gitea-e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5.tar.gz gitea-e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
conf/app.ini
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/avatar/avatar.go | 4 | ||||
| -rw-r--r-- | modules/base/conf.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index 0ba20294af..3b423a6d15 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -251,8 +251,8 @@ var client = &http.Client{} func (this *thunderTask) fetch() error { req, _ := http.NewRequest("GET", this.Url, nil) - req.Header.Set("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8") - req.Header.Set("Accept-Encoding", "gzip,deflate,sdch") + req.Header.Set("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/jpeg,image/png,*/*;q=0.8") + req.Header.Set("Accept-Encoding", "deflate,sdch") req.Header.Set("Accept-Language", "zh-CN,zh;q=0.8") req.Header.Set("Cache-Control", "no-cache") req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.154 Safari/537.36") diff --git a/modules/base/conf.go b/modules/base/conf.go index c692ddc23f..d0f8ae2cc8 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -243,7 +243,7 @@ func newNotifyMailService() { } func NewConfigContext() { - var err error + //var err error workDir, err := exeDir() if err != nil { fmt.Printf("Fail to get work directory: %s\n", err) |