IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 20:24:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8394 from berghauz/master

Browse Source 
Proxy support added to webdav uploader, fixes #7922
This commit is contained in:
Daniel Lee 2017-05-17 14:49:22 +02:00 committed by GitHub
commit 16fb7a2e4a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/components/imguploader/webdavuploader.go
View File

@ -21,6 +21,7 @@ type WebdavUploader struct {
}
var netTransport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
Timeout: 60 * time.Second,
}).Dial,