[cpp-sp] branch main updated: Try to avoid breaking a working SP3 deployment

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/7bf3cd4765e83e053f1b8af2a861a1153eb96392

The following commit(s) were added to refs/heads/main by this push:
     new 7bf3cd47 Try to avoid breaking a working SP3 deployment
7bf3cd47 is described below

commit 7bf3cd4765e83e053f1b8af2a861a1153eb96392
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sun Feb 1 16:45:03 2026 -0500

    Try to avoid breaking a working SP3 deployment
    
    This relies on the Apache config fragment for SP4 being loaded after
    than the one for SP3.
---
 configs/apache24.config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/apache24.config.in b/configs/apache24.config.in
index a1a07810..8480e388 100644
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -5,6 +5,9 @@
 # For non-RPM installs, you should copy the relevant contents of
 # this file to a configuration location you control.
 
+# Avoid conflict with SP3 module
+<IfModule !mod_shib>
+
 #
 # Load the Shibboleth module.
 #
@@ -38,3 +41,5 @@ ShibCompatValidUser Off
   ShibRequestSetting requireSession 1
   require shib-session
 </Location>
+
+</IfModule>  # !mod_shib

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.