summaryrefslogtreecommitdiff
path: root/src/server/proxy
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-02-07 21:02:33 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-02-07 21:02:33 +0900
commit5448c22031d66cc020323bf4c4d1701889a46485 (patch)
treee14772d48d982c6a7d9cebeed497c16373e2e303 /src/server/proxy
parentFix #4179 (diff)
downloadsharkey-5448c22031d66cc020323bf4c4d1701889a46485.tar.gz
sharkey-5448c22031d66cc020323bf4c4d1701889a46485.tar.bz2
sharkey-5448c22031d66cc020323bf4c4d1701889a46485.zip
Revert 96bc17aa1014983d5e6bf8b4c05d898156995a0d
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 95491b6141..3f234a727d 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.getOrElse(null),
+ proxy: config.proxy,
timeout: 10 * 1000,
headers: {
'User-Agent': config.user_agent