Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.

configured Proxy settings proxy can now be set on localhost #20

Merged
merged 1 commit into from
May 19, 2017
Merged

configured Proxy settings proxy can now be set on localhost #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/main/java/com/sybit/airtable/Airtable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,7 @@ private void configureProxy(String endpointUrl) {
if (this.config.getProxy() == null) {
final String httpProxy = System.getenv("http_proxy");
final String httpsProxy = System.getenv("https_proxy");
if (httpProxy != null
&& (endpointUrl.contains("127.0.0.1")
|| endpointUrl.contains("localhost"))) {
LOG.info("Use Proxy: ignored for 'localhost' ann '127.0.0.1'");
setProxy(null);
} else if (httpsProxy != null
if (httpsProxy != null
&& (endpointUrl.contains("https"))) {
LOG.info("Use Proxy: Environment variable 'https_proxy' found and used: " + httpsProxy);
setProxy(httpProxy);
Expand All @@ -220,8 +215,10 @@ private void configureProxy(String endpointUrl) {
}
} else if ((endpointUrl.contains("127.0.0.1")
|| endpointUrl.contains("localhost"))) {
LOG.info("Use Proxy: ignored for 'localhost' ann '127.0.0.1'");
LOG.info("Use Proxy: ignored for 'localhost' and '127.0.0.1'");
setProxy(null);
} else {
setProxy(this.config.getProxy());
}
}

Expand Down