rgw: Fix civetweb IPv6 #10579
Merged
rgw: Fix civetweb IPv6 #10579
Conversation
This file contains 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
Commit c38e3cb introduced a second compiled version of src/civetweb/src/civetweb.c, but did not pass the configuration header (civetweb/include/civetweb_conf.h). As a result, USE_IPV6 was not defined when it was compiled, and that copy was included into the radosgw binary. This caused breakage for the civetweb frontend when used with IPv6: rgw frontends = civetweb port=[::]:7480 Reintroduce the header so that civetweb is compiled correctly again. Fixes: http://tracker.ceph.com/issues/16928 Backport: jewel Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
|
This looks fine, but it omits to fix the CMake build. @robbat2 are you ok with me doing that, or sending a second PR (I think we can merge this one now)? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 c38e3cb introduced a second
compiled version of src/civetweb/src/civetweb.c, but did not pass the
configuration header (civetweb/include/civetweb_conf.h).
As a result, USE_IPV6 was not defined when it was compiled, and that
copy was included into the radosgw binary. This caused breakage for the
civetweb frontend when used with IPv6:
rgw frontends = civetweb port=[::]:7480
Reintroduce the header so that civetweb is compiled correctly again.
Fixes: http://tracker.ceph.com/issues/16928
Backport: jewel
Signed-off-by: Robin H. Johnson robin.johnson@dreamhost.com