[cpp-sp] branch main updated: SSPCPP-934

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  5dd2007a  SSPCPP-934
5dd2007a is described below

commit 5dd2007ae423ed73d14119e586a76fa205d525d8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 21 10:36:30 2021 -0400

    SSPCPP-934
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-934
---
 iis7_shib/IIS7Request.cpp | 9 +++++++++
 iis7_shib/iis7_shib.rc    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/iis7_shib/IIS7Request.cpp b/iis7_shib/IIS7Request.cpp
index 658fb3d0..0f1cbd92 100644
--- a/iis7_shib/IIS7Request.cpp
+++ b/iis7_shib/IIS7Request.cpp
@@ -268,6 +268,15 @@ string IIS7Request::getRemoteAddr() const
 
 string IIS7Request::getSecureHeader(const char* name) const
 {
+    if (m_useVariables) {
+        PCSTR p;
+        DWORD len;
+        HRESULT hr = m_ctx->GetServerVariable(name, &p, &len);
+        if (SUCCEEDED(hr)) {
+            return (nullptr == p) ? "" : p;
+        }
+        return "";
+    }
     PCSTR p = m_request->GetHeader(g_bSafeHeaderNames ? makeSafeHeader(name).c_str() : name);
     return (nullptr == p) ? "" : p;
 }
diff --git a/iis7_shib/iis7_shib.rc b/iis7_shib/iis7_shib.rc
index dca33d0f..d6958e9a 100644
--- a/iis7_shib/iis7_shib.rc
+++ b/iis7_shib/iis7_shib.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION RC_FILE_VERSION, 0
-PRODUCTVERSION RC_PRODUCT_VERSION, 0
+FILEVERSION RC_FILE_VERSION, 2
+PRODUCTVERSION RC_PRODUCT_VERSION, 2
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

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