Conversation
This commit makes it possible to use mod_auth_cas with more than one one CAS server. It is now possible to configure CASLoginURL, CASValidateURL and other directives on a per-directory level, not just on the per-server level.
# Conflicts: # src/mod_auth_cas.c # src/mod_auth_cas.h
Contributor
|
@studersi It's probably easier if you rebase the commits on top of master, rather than merge in master. The merge commit is too big to comfortably review. Feel free to drop attribution if that means rewriting (say) > 50% of a commit. |
Contributor
Author
|
OK, I'll create a new PR once I'm done. |
Contributor
Author
|
I think I actually mixed up some files, that's why the diff doesn't really work. I created a new pull request after cleaning that up. |
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.
Resolve merge conflicts of #36.
This pull request consists of the three commits made by @bnoordhuis plus a merge commit that resolves the conflicts.