From 26a83b7c57877f7b52a93d1de4822f92cdeefe32 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 20 May 2013 15:49:23 +0000
Subject: [PATCH] https://issues.shibboleth.net/jira/browse/SSPCPP-493

---
 Shibboleth.sln             |  1 +
 configs/apache.config.in   | 23 ++++++++++++++++-------
 configs/apache2.config.in  | 13 +++++++++++++
 configs/apache22.config.in | 13 +++++++++++++
 configs/apache24.config.in | 13 +++++++++++++
 5 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/Shibboleth.sln b/Shibboleth.sln
index f5d8be1..93a9db4 100644
--- a/Shibboleth.sln
+++ b/Shibboleth.sln
@@ -36,6 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BC
 		configs\accessError.html = configs\accessError.html
 		configs\apache.config.in = configs\apache.config.in
 		configs\apache2.config.in = configs\apache2.config.in
+		configs\apache22.config.in = configs\apache22.config.in
 		configs\apache24.config.in = configs\apache24.config.in
 		configs\attrChecker.html = configs\attrChecker.html
 		configs\attribute-map.xml = configs\attribute-map.xml
diff --git a/configs/apache.config.in b/configs/apache.config.in
index 54d64b6..998c864 100644
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -18,21 +18,30 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
 # extension.
 #
 <Files *.sso>
-SetHandler shib-handler
+  SetHandler shib-handler
 </Files>
 
-# Another way of addressing this is to apply Shibboleth
-# globally to the site in "lazy" session mode:
-# <Location />
-# AuthType shibboleth
-# require shibboleth
-# </Location>
+#
+# Ensures handler will be accessible.
+#
+<Location /Shibboleth.sso>
+  Satisfy Any
+  Allow from all
+  AuthType None
+  Require all granted
+</Location>
 
 #
 # Used for example style sheet in error templates.
 #
 <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 4232d86..b167a51 100644
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -13,11 +13,24 @@
 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>
+
+#
 # Used for example style sheet in error templates.
 #
 <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 bdb7414ff..07869f3 100644
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -13,11 +13,24 @@
 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>
+
+#
 # Used for example style sheet in error templates.
 #
 <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 2d1a2c2..1bae07a 100644
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -13,11 +13,24 @@
 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>
+
+#
 # Used for example style sheet in error templates.
 #
 <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>
-- 
2.1.4