Cosign 3.2.0: apache >=2.4.18 patches - #7
Open
kabalin wants to merge 7 commits into
Open
Conversation
Apache 2.4 renames the conn_rec struct member name from "remote_ip" to "client_ip". Detect 2.4 and use COSIGN_CLIENT_IP macro to use the correct struct member name for 2.2 and 2.4.
Fix compiling for Apache 2.4.x.
(cherry picked from commit ff6d367)
|
We use Apache 2.4 on Ubuntu, and when trying to build this patch using "make filters" we get the following error: Any advise would be appreciated Thanks |
Author
|
Are you sure you are compiling it for 2.4? What is the exact version number? |
|
Version is Apache/2.4.18 (Ubuntu) Thanks |
Since autoconf 2.69 all AC_DEFINE parameters are required. "If neither value nor description are given, then value defaults to 1 instead of to the empty string. This is for backwards compatibility with older versions of Autoconf, but this usage is obsolescent and may be withdrawn in future versions of Autoconf." (https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Defining-Symbols.html)
Author
|
Added fixes for 2.4.18+ @AaronMcHale try building again on Ubuntu and let me know if there are issues. |
kabalin
changed the title
kabalin
changed the title
It seems apache2 -v output changed so it can't be parsed using existing sed syntax in APACHE2_MINOR_VERSION definition. Instead we use $APXS2 -q HTTPD_VERSION to avoid abovementioned ambiguity in version string and extract minor release number using awk.
kabalin
force-pushed
the
cosign-3.2.0-branch-apache24
branch
from
June 14, 2018 14:01
49ea631 to
8e19cd8
Compare
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.
This is just master branch patches cherry-picked and applied on top of 3.2.0 stable branch to make it compile with no errors for Apache 2.4.
This is closing #4.