diff options
author | Benjamin Frank <ben+github@pipsfrank.de> | 2016-07-05 21:40:33 +0200 |
---|---|---|
committer | Benjamin Frank <ben+github@pipsfrank.de> | 2016-07-06 11:06:28 +0200 |
commit | c8733351614bed77bd72708fdb12b36268cb2a28 (patch) | |
tree | 60e069857eefee238406202a1a0ba4e690017025 /stage2/Lib.scala | |
parent | 11342ecc8c6bd92e73b8ad9a2791f8d9462043a6 (diff) | |
download | cbt-c8733351614bed77bd72708fdb12b36268cb2a28.tar.gz cbt-c8733351614bed77bd72708fdb12b36268cb2a28.tar.bz2 cbt-c8733351614bed77bd72708fdb12b36268cb2a28.zip |
Support proxy settings in CBT.
Proxy settings can be supplied either via Java system-properties or via
environment variables (http_proxy/https_proxy/no_proxy).
Java system-properties take precedence over env vars. Evaluation of
proxy settings happens only during nailgun startup for now.
Diffstat (limited to 'stage2/Lib.scala')
-rw-r--r-- | stage2/Lib.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala index a060ac6..b65af2d 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -394,7 +394,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ import java.io._ val url = baseUrl ++ fileName System.err.println(blue("uploading ") ++ url.toString) - val httpCon = url.openConnection.asInstanceOf[HttpURLConnection] + val httpCon = Stage0Lib.openConnectionConsideringProxy(url) httpCon.setDoOutput(true) httpCon.setRequestMethod("PUT") credentials.foreach( |