diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-06 22:49:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-06 22:49:42 +0900 |
| commit | cf304f88d46873d5e3aa3f62424b187d5478a0bf (patch) | |
| tree | 8f5742f58def0b64bd5ef0f57bb4e030f0ca2934 /src/server/proxy | |
| parent | Fix cofig for ci (diff) | |
| parent | Check config on load (#4170) (diff) | |
| download | misskey-cf304f88d46873d5e3aa3f62424b187d5478a0bf.tar.gz misskey-cf304f88d46873d5e3aa3f62424b187d5478a0bf.tar.bz2 misskey-cf304f88d46873d5e3aa3f62424b187d5478a0bf.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server/proxy')
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 2 |
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 |