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

Add GRPC_ARG_HTTP_PROXY channel argument. #20866

Merged
merged 4 commits into from
May 8, 2020
Merged

Conversation

klfreeman
Copy link
Contributor

Introduce the GRPC_ARG_HTTP_PROXY channel argument so that HTTP proxy
settings can be controlled per channel.

@yashykt

Introduce the GRPC_ARG_HTTP_PROXY channel argument so that HTTP proxy
settings can be controlled per channel.
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Oct 30, 2019

CLA Check
The committers are authorized under a signed CLA.

src/core/ext/filters/client_channel/http_proxy.cc Outdated Show resolved Hide resolved
src/core/ext/filters/client_channel/http_proxy.cc Outdated Show resolved Hide resolved
include/grpc/impl/codegen/grpc_types.h Outdated Show resolved Hide resolved
@markdroth markdroth added kokoro:run lang/core release notes: yes Indicates if PR needs to be in release notes labels Oct 30, 2019
- Clarify comments
- Simplify code by using grpc_channel_args_find_string function
@markdroth
Copy link
Member

Sorry for the delay; this somehow slipped off my radar.

The changes look good, but it looks like there's a merge conflict to address.

@klfreeman
Copy link
Contributor Author

I've resolved the merge conflicts, noticed that one of the Sanity Checks was failing, and fixed the formatting error. Hopefully should be ready to merge now.

Copy link
Member

@markdroth markdroth left a comment

Choose a reason for hiding this comment

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

This change looks good to me.

I've triggered the tests to run. Yash, if everything looks good with the tests, please feel free to merge.

@stale
Copy link

stale bot commented May 6, 2020

This issue/PR has been automatically marked as stale because it has not had any update (including commits, comments, labels, milestones, etc) for 30 days. It will be closed automatically if no further update occurs in 7 day. Thank you for your contributions!

@markdroth
Copy link
Member

Yash, can you please check the tests and get this merged? Thanks!

@stale stale bot removed the disposition/stale label May 6, 2020
@yashykt
Copy link
Member

yashykt commented May 8, 2020

The test failures are all old and unrelated #22002, #21700, #20324

@yashykt yashykt merged commit 32a2310 into grpc:master May 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lang/core release notes: yes Indicates if PR needs to be in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants