From c713bd9a9a1bd3f3ca32d9b25de81911b038b1b1 Mon Sep 17 00:00:00 2001 From: berghauz Date: Wed, 17 May 2017 02:50:56 +0300 Subject: [PATCH 1/2] Proxy support added, fixes #7922 Well, i'm really want to see it working in 4.3.0 --- pkg/components/imguploader/webdavuploader.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go index ae3c5b5e194..b71bd68a8a2 100644 --- a/pkg/components/imguploader/webdavuploader.go +++ b/pkg/components/imguploader/webdavuploader.go @@ -21,6 +21,7 @@ type WebdavUploader struct { } var netTransport = &http.Transport{ + Proxy: http.ProxyFromEnvironment, Dial: (&net.Dialer{ Timeout: 60 * time.Second, }).Dial, From 48cf58e7394c58e02e30df2316d08d823586a8e8 Mon Sep 17 00:00:00 2001 From: berghauz Date: Wed, 17 May 2017 03:58:18 +0300 Subject: [PATCH 2/2] Indenting fix --- pkg/components/imguploader/webdavuploader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go index b71bd68a8a2..4a056e3a48a 100644 --- a/pkg/components/imguploader/webdavuploader.go +++ b/pkg/components/imguploader/webdavuploader.go @@ -21,7 +21,7 @@ type WebdavUploader struct { } var netTransport = &http.Transport{ - Proxy: http.ProxyFromEnvironment, + Proxy: http.ProxyFromEnvironment, Dial: (&net.Dialer{ Timeout: 60 * time.Second, }).Dial,