UPSTREAM: 11694: http proxy support for exec/pf

[ncdc]

Pull in support for http proxy with exec/attach/port forward that just missed the last rebase by a few hours. Note, this only pulls in the pkg file. The other changes in 11694 are all e2e test related, and they're not 100% correct and had to be corrected in a series of follow-ups, so I chose not to include any of that here. They can come in with the next rebase, if that's ok.

@sdodson @deads2k @liggitt @smarterclayton @brenton

[liggitt]

Is this the latest state of the spdy roundtripper upstream including any follow-up fixes? If so, LGTM

[ncdc]

@liggitt I diffed w/the upstream file and it came out clean.

[ncdc]

After spending 15 minutes trying to figure out why hack/cherry-pick.sh wasn't working (#5395), I gave up and did it by hand...

[ncdc]

[test]

[openshift-bot]

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/6164/)

[openshift-bot]

Evaluated for origin test up to 5f9ae44

[ncdc]

[merge]

[openshift-bot]

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/3774/) (Image: devenv-rhel7_2564)

[openshift-bot]

Evaluated for origin merge up to 5f9ae44

[smarterclayton]

Probably because it's already merged?

On Oct 26, 2015, at 9:33 AM, Andy Goldstein notifications@github.com
wrote:

After spending 15 minutes trying to figure out why hack/cherry-pick.sh
wasn't working (#5395 #5395), I
gave up and did it by hand...

—
Reply to this email directly or view it on GitHub
#5397 (comment).

[ncdc]

It merged upstream, but a few hours after we started our rebase, so it missed getting into origin with the rebase. The problem is cherry-pick.sh doesn't support binary diffs for git apply. I have an open PR to fix that.