[cpp-sp] branch master updated: Update safeHeaderNames default if new useHeaders setting is on.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=4cd133bd138205ffe2c8004aaeba35871a13e34d

The following commit(s) were added to refs/heads/master by this push:
       new  4cd133b   Update safeHeaderNames default if new useHeaders setting is on.
4cd133b is described below

commit 4cd133bd138205ffe2c8004aaeba35871a13e34d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 19 17:09:21 2018 -0400

    Update safeHeaderNames default if new useHeaders setting is on.
---
 iis7_shib/register.cpp    | 7 +++++--
 isapi_shib/isapi_shib.cpp | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/iis7_shib/register.cpp b/iis7_shib/register.cpp
index 9f7e808..09af7e7 100644
--- a/iis7_shib/register.cpp
+++ b/iis7_shib/register.cpp
@@ -166,12 +166,15 @@ RegisterModule(
         if (props) {
             flag = props->getBool("normalizeRequest");
             g_bNormalizeRequest = !flag.first || flag.second;
-            flag = props->getBool("safeHeaderNames");
-            g_bSafeHeaderNames = flag.first && flag.second;
             flag = props->getBool("useHeaders");
             g_bUseHeaders = flag.first && flag.second;
             flag = props->getBool("useVariables");
             g_bUseVariables= !flag.first || flag.second;
+            flag = props->getBool("safeHeaderNames");
+            if (g_bUseHeaders)
+            	g_bSafeHeaderNames = !flag.first || flag.second;
+            else
+            	g_bSafeHeaderNames = flag.first && flag.second;
 
             const string prefix(XMLHelper::getAttrString(props->getElement(), "/Shibboleth.sso", handlerPrefix));
             std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp
index fabaaa0..21bcadd 100644
--- a/isapi_shib/isapi_shib.cpp
+++ b/isapi_shib/isapi_shib.cpp
@@ -227,9 +227,9 @@ extern "C" BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer)
             flag = props->getBool("safeHeaderNames");
             g_bSafeHeaderNames = flag.first && flag.second;
             if (props->getString("useHeaders").first)
-                log.warn("useHeaders attribute not valid for this filter");
+                log.warn("useHeaders attribute not supported by ISAPI filter, ignored");
             if (props->getString("useVariables").first)
-                log.warn("useVariables attribute not valid for this filter");
+                log.warn("useVariables attribute not supported by ISAPI filter, ignored");
 
             const DOMElement* child = XMLHelper::getFirstChildElement(props->getElement(), Site);
             while (child) {

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