mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge pull request #8394 from berghauz/master
Proxy support added to webdav uploader, fixes #7922
This commit is contained in:
commit
16fb7a2e4a
@ -21,6 +21,7 @@ type WebdavUploader struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var netTransport = &http.Transport{
|
var netTransport = &http.Transport{
|
||||||
|
Proxy: http.ProxyFromEnvironment,
|
||||||
Dial: (&net.Dialer{
|
Dial: (&net.Dialer{
|
||||||
Timeout: 60 * time.Second,
|
Timeout: 60 * time.Second,
|
||||||
}).Dial,
|
}).Dial,
|
||||||
|
Loading…
Reference in New Issue
Block a user