summaryrefslogtreecommitdiff
path: root/src/server/proxy
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2019-02-06 22:44:55 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-06 22:44:55 +0900
commit96bc17aa1014983d5e6bf8b4c05d898156995a0d (patch)
treefdf7c68bdbf3784988351004127db988d7c40c29 /src/server/proxy
parentFix bug (diff)
downloadsharkey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.gz
sharkey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.tar.bz2
sharkey-96bc17aa1014983d5e6bf8b4c05d898156995a0d.zip
Check config on load (#4170)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/server/proxy')
-rw-r--r--src/server/proxy/proxy-media.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts
index 3f234a727d..95491b6141 100644
--- a/src/server/proxy/proxy-media.ts
+++ b/src/server/proxy/proxy-media.ts
@@ -69,7 +69,7 @@ async function fetch(url: string, path: string) {
const req = request({
url: requestUrl,
- proxy: config.proxy,
+ proxy: config.proxy.getOrElse(null),
timeout: 10 * 1000,
headers: {
'User-Agent': config.user_agent