Corrections to SSPCPP-493 change

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 998c864..bf7f069 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -25,10 +25,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>

-  Satisfy Any

   Allow from all
   AuthType None
   Allow from all
   AuthType None

-  Require all granted

 </Location>
 
 #
 </Location>
 
 #


@@ -37,10 +35,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
 <IfModule mod_alias.c>
   Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
   <Location /shibboleth-sp>
 <IfModule mod_alias.c>
   Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
   <Location /shibboleth-sp>

-    Satisfy Any

     Allow from all
     AuthType None
     Allow from all
     AuthType None

-    Require all granted

   </Location>
 </IfModule>
 
   </Location>
 </IfModule>
 

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index b167a51..8766263 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -16,10 +16,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>

-  Satisfy Any

   Allow from all
   AuthType None
   Allow from all
   AuthType None

-  Require all granted

 </Location>
 
 #
 </Location>
 
 #


@@ -27,10 +25,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>

-    Satisfy Any

     Allow from all
     AuthType None
     Allow from all
     AuthType None

-    Require all granted

   </Location>
   Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
 </IfModule>
   </Location>
   Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
 </IfModule>

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index 07869f3..0154e6d 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -16,10 +16,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>

-  Satisfy Any

   Allow from all
   AuthType None
   Allow from all
   AuthType None

-  Require all granted

 </Location>
 
 #
 </Location>
 
 #


@@ -27,10 +25,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>

-    Satisfy Any

     Allow from all
     AuthType None
     Allow from all
     AuthType None

-    Require all granted

   </Location>
   Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
 </IfModule>
   </Location>
   Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
 </IfModule>

diff --git a/configs/apache24.config.in b/configs/apache24.config.in
index 1bae07a..a069188 100644 (file)
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -16,8 +16,6 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_24.so
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>
 # Ensures handler will be accessible.
 #
 <Location /Shibboleth.sso>

-  Satisfy Any
-  Allow from all

   AuthType None
   Require all granted
 </Location>
   AuthType None
   Require all granted
 </Location>


@@ -27,8 +25,6 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_24.so
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>

-    Satisfy Any
-    Allow from all

     AuthType None
     Require all granted
   </Location>
     AuthType None
     Require all granted
   </Location>