Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

245: Fix proxy protocol setting, add logging #382

Closed
wants to merge 2 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Jan 24, 2020

Hi all,

Please review this follow-up change that fixes the proxy type selection, and also adds some logging. In addition, if proxy settings are picked up from the environment, nonProxyHosts are now always set. This avoids a problem when nonProxyHosts has a default value.

Best regards,
Robin

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

SKARA-245: CLI tools do not consider git's http.proxy configuration

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 24, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@openjdk openjdk bot added the rfr label Jan 24, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 24, 2020

Webrevs

edvbld
edvbld approved these changes Jan 24, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good, thanks Robin for fixing this! Just a very minor nit about adding a comment.

}
if (res == 0 && !output.isEmpty()) {
if (!output.startsWith("http://") && !output.startsWith("https://")) {
output = "http://" + output;
Copy link
Member

@edvbld edvbld Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment that the protocol being prepended doesn't matter?

Copy link
Member Author

@rwestberg rwestberg Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, sounds reasonable.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 24, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

245: Fix proxy protocol setting, add logging

Reviewed-by: ehelin
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to do this manually, please merge master into your branch first.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 24, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Jan 24, 2020

/integrate

@openjdk openjdk bot closed this Jan 24, 2020
@openjdk openjdk bot added the integrated label Jan 24, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 24, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • 10552fd: Make it possible to only allow PRs against a select set of target branches

Your commit was automatically rebased without conflicts.

Pushed as commit e59a67f.

@openjdk openjdk bot removed the ready label Jan 24, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 24, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: e59a67f
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-01-24 14:09:28 +0000
URL: https://git.openjdk.java.net/skara/commit/e59a67fe

245: Fix proxy protocol setting, add logging

Reviewed-by: ehelin

! proxy/src/main/java/module-info.java
! proxy/src/main/java/org/openjdk/skara/proxy/HttpProxy.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants