From 010a7cd312ea32e6f1e12a8b986fb7467aaf11e2 Mon Sep 17 00:00:00 2001
From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Tue, 21 May 2013 14:44:37 +0000
Subject: [PATCH] Corrections to SSPCPP-493 change

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3850 cb58f699-b61c-0410-a6fe-9272a202ed29
---
 configs/apache.config.in   | 4 ----
 configs/apache2.config.in  | 4 ----
 configs/apache22.config.in | 4 ----
 configs/apache24.config.in | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 998c864..bf7f069 100644
--- 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>
-  Satisfy Any
   Allow from all
   AuthType None
-  Require all granted
 </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>
-    Satisfy Any
     Allow from all
     AuthType None
-    Require all granted
   </Location>
 </IfModule>
 
diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index b167a51..8766263 100644
--- 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>
-  Satisfy Any
   Allow from all
   AuthType None
-  Require all granted
 </Location>
 
 #
@@ -27,10 +25,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>
-    Satisfy Any
     Allow from all
     AuthType None
-    Require all granted
   </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
--- 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>
-  Satisfy Any
   Allow from all
   AuthType None
-  Require all granted
 </Location>
 
 #
@@ -27,10 +25,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
 #
 <IfModule mod_alias.c>
   <Location /shibboleth-sp>
-    Satisfy Any
     Allow from all
     AuthType None
-    Require all granted
   </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
--- 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>
-  Satisfy Any
-  Allow from all
   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>
-    Satisfy Any
-    Allow from all
     AuthType None
     Require all granted
   </Location>
-- 
2.1.4