Resolve 14506, avoid libidn2 for our curl dependency#14601
Merged
htuch merged 1 commit intoenvoyproxy:masterfrom Jan 8, 2021
Merged
Resolve 14506, avoid libidn2 for our curl dependency#14601htuch merged 1 commit intoenvoyproxy:masterfrom
htuch merged 1 commit intoenvoyproxy:masterfrom
Conversation
- Reviews the proposal of @jay to resolve libidn2 feature election curl/curl#6362 - Uses -U2 for the patch, to ensure placement but not useless collisions - Moves extended text of the problems addressed to the patch Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
repokitteh-read-only
bot
added
the
deps
htuch
reviewed
Jan 8, 2021
|
|
||
| # Check for idn | ||
| -check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) | ||
| +option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) |
Member
There was a problem hiding this comment.
Why can't we consume this from upstream when curl/curl#6362 merges?
Contributor
Author
There was a problem hiding this comment.
Why the presumption that it will be accepted? Why would we ship a broken 1.17.0? This is our proof of concept, if it it works for us that's +1 at curl, if adopted in curl 7.75 we drop the hack, in the meantime it proves it up. Expect this to be a much greater problem if we ship Ubuntu 18.04 or 20.04 images, since libidn2 is becoming more prevelant, but not enough to ensure an external dependency is provisioned
Contributor
Author
There was a problem hiding this comment.
(Please review #14506 for an explanation of why this will be problematic when 1.17.0 drops.)
Member
|
/lgtm deps |
repokitteh-read-only
bot
removed
the
deps
mpuncel
added a commit
to mpuncel/envoy
that referenced
this pull request
Jan 8, 2021
* master: (48 commits) Resolve 14506, avoid libidn2 for our curl dependency (envoyproxy#14601) fix new/free mismatch in Mainthread utility (envoyproxy#14596) opencensus: deprecate Zipkin configuration. (envoyproxy#14576) upstream: clean up code location (envoyproxy#14580) configuration impl: add cast for ios compilation (envoyproxy#14590) buffer impl: add cast for android compilation (envoyproxy#14589) ratelimit: add dynamic metadata to ratelimit response (envoyproxy#14508) tcp_proxy: wait for CONNECT response before start streaming data (envoyproxy#14317) stream info: cleanup address handling (envoyproxy#14432) [deps] update upb to latest commit (envoyproxy#14582) Add utility to check whether the execution is in main thread. (envoyproxy#14457) listener: undeprecate bind_to_port (envoyproxy#14480) Fix data race in overload integration test (envoyproxy#14586) deps: update PGV (envoyproxy#14571) dependencies: update cve_scan.py for some libcurl 7.74.0 false positives. (envoyproxy#14572) Network::Connection: Add L4 crash dumping support (envoyproxy#14509) ssl: remember stat names for configured ciphers. (envoyproxy#14534) formatter: add custom date formatting to downstream cert start and end dates (envoyproxy#14502) feat(lua): allow setting response body when the upstream response body is empty (envoyproxy#14486) Generalize the gRPC access logger base classes (envoyproxy#14469) ... Signed-off-by: Michael Puncel <mpuncel@squareup.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit Message: Resolve 14506, avoid libidn2 for our curl dependency
Additional Description:
This additional patch to dodge idn2 is draft, but hopefully resembles the final patch
to let us pass a simple toggle to avoid libidn2 for machines deployed without
libidn2 libs. In any case, any dynamic additional ld requirement goes against the
static build model, and libidn2 would have to be added to the envoy build.
As we expect to deprecate curl, this would be movement in the wrong direction.
Signed-off-by: William A Rowe Jr wrowe@vmware.com
Risk Level: low
Testing: local
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: Linux ldd bindings
Fixes: #14506