diff options
| author | ruki <[email protected]> | 2021-03-18 10:30:07 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-18 10:30:07 +0800 |
| commit | 60932027d85e9cb499132351b5f080f8d2f572a8 (patch) | |
| tree | 107412b9a4a5409b10491a70b1530bb8d784aed9 | |
| parent | a1ebb6a1b37dbcca45da44cb1b9a4f0341a2684a (diff) | |
| parent | aa63ead144c15338bb58be18a6e28b027f82689d (diff) | |
Merge pull request #1292 from knightjun/dev
修复在设置了代理而没有pac文件的情况下，curl不会走代理的问题
| -rw-r--r-- | xmake/modules/net/proxy.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xmake/modules/net/proxy.lua b/xmake/modules/net/proxy.lua index 0f358172c..5f093b9c5 100644 --- a/xmake/modules/net/proxy.lua +++ b/xmake/modules/net/proxy.lua @@ -88,6 +88,9 @@ function get(url) if proxy_pac and proxy_pac(url, host) then return global.get("proxy") end + if not proxy_pac and not proxy_hosts then + return global.get("proxy") + end return end |