diff options
| author | adamw <adam@warski.org> | 2018-03-08 16:02:40 -0600 |
|---|---|---|
| committer | adamw <adam@warski.org> | 2018-03-08 16:03:04 -0600 |
| commit | f5bac56b61296292bfea8f56ce3fde2b856d3502 (patch) | |
| tree | 47d81d73e18c97914a3fcf96540dae5b5a04424f | |
| parent | 7a787fe227c7c893885ad271de5ffb34f7bd453e (diff) | |
| download | sttp-f5bac56b61296292bfea8f56ce3fde2b856d3502.tar.gz sttp-f5bac56b61296292bfea8f56ce3fde2b856d3502.tar.bz2 sttp-f5bac56b61296292bfea8f56ce3fde2b856d3502.zip | |
Adding https.proxyHost as a fallback when looking for proxy settings
| -rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/SttpBackendOptions.scala | 3 | ||||
| -rw-r--r-- | docs/conf/proxy.rst | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/src/main/scala/com/softwaremill/sttp/SttpBackendOptions.scala b/core/src/main/scala/com/softwaremill/sttp/SttpBackendOptions.scala index 89fb542..28408b3 100644 --- a/core/src/main/scala/com/softwaremill/sttp/SttpBackendOptions.scala +++ b/core/src/main/scala/com/softwaremill/sttp/SttpBackendOptions.scala @@ -67,8 +67,9 @@ object SttpBackendOptions { import ProxyType._ val socks = system("socksProxyHost", "socksProxyPort", proxy(Socks), 1080) val http = system("http.proxyHost", "http.proxyPort", proxy(Http), 80) + val https = system("https.proxyHost", "https.proxyPort", proxy(Http), 443) - Seq(socks, http).find(_.isDefined).flatten + Seq(socks, http, https).find(_.isDefined).flatten } } diff --git a/docs/conf/proxy.rst b/docs/conf/proxy.rst index bcb1b3a..7e07011 100644 --- a/docs/conf/proxy.rst +++ b/docs/conf/proxy.rst @@ -7,6 +7,7 @@ Following settings are checked: 1. ``socksProxyHost`` and ``socksProxyPort`` *(default: 1080)* 2. ``http.proxyHost`` and ``http.proxyPort`` *(default: 80)* +2. ``https.proxyHost`` and ``https.proxyPort`` *(default: 443)* Settings are loaded **in given order** and the **first existing value** is being used. |