Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi backend #159

Closed
wants to merge 4 commits into from
Closed

Multi backend #159

wants to merge 4 commits into from

Conversation

studersi
Copy link
Contributor

@studersi studersi commented Oct 1, 2018

Resolve merge conflicts of #36.

This pull request consists of the three commits made by @bnoordhuis plus a merge commit that resolves the conflicts.

bnoordhuis and others added 4 commits May 11, 2012 06:01
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
@bnoordhuis
Copy link
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.

@studersi
Copy link
Contributor Author

studersi commented Oct 2, 2018

OK, I'll create a new PR once I'm done.

@studersi studersi closed this Oct 2, 2018
@studersi
Copy link
Contributor Author

studersi commented Oct 2, 2018

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants