[cpp-sp] branch main updated: Full rename of IIS module.

Scott Cantor cantor.2 at osu.edu
Thu Oct 16 16:02:31 UTC 2025 

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=b7d39c4120b3913881437d8198780d68261a83be

The following commit(s) were added to refs/heads/main by this push:
     new b7d39c41 Full rename of IIS module.
b7d39c41 is described below

commit b7d39c4120b3913881437d8198780d68261a83be
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 16 12:02:18 2025 -0400

    Full rename of IIS module.
---
 Projects/vc22/iis.vcxproj                          | 42 +++++++++++-----------
 Projects/vc22/iis.vcxproj.filters                  | 18 +++++-----
 {iis7_shib => iis}/IIS7Request.cpp                 |  2 +-
 {iis7_shib => iis}/ShibHttpModule.cpp              |  2 +-
 {iis7_shib => iis}/ShibUser.cpp                    |  2 +-
 {iis7_shib => iis}/headers/IIS7Request.hpp         |  0
 {iis7_shib => iis}/headers/ShibHttpModule.hpp      |  2 +-
 {iis7_shib => iis}/headers/ShibUser.hpp            |  0
 .../headers/IIS7_shib.hpp => iis/headers/iis.hpp   |  0
 iis7_shib/iis7_shib.rc => iis/iis.rc               |  6 ++--
 {iis7_shib => iis}/register.cpp                    |  2 +-
 shibsp/session/impl/AbstractSessionCache.cpp       |  2 +-
 12 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Projects/vc22/iis.vcxproj b/Projects/vc22/iis.vcxproj
index c6291e38..fb2bf6d3 100644
--- a/Projects/vc22/iis.vcxproj
+++ b/Projects/vc22/iis.vcxproj
@@ -27,11 +27,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\iis7_shib\iis7_shib.rc" />
+    <ResourceCompile Include="..\..\iis\iis.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\iis7_shib\IIS7Request.cpp" />
-    <ClCompile Include="..\..\iis7_shib\register.cpp">
+    <ClCompile Include="..\..\iis\IIS7Request.cpp" />
+    <ClCompile Include="..\..\iis\register.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)shibsp\$(configuration)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)shibsp\$(configuration)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir)shibsp\$(platform)\$(configuration)</AdditionalIncludeDirectories>
@@ -39,14 +39,14 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)shibsp\$(platform)\$(configuration)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)shibsp\$(platform)\$(configuration)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ClCompile Include="..\..\iis7_shib\ShibHttpModule.cpp" />
-    <ClCompile Include="..\..\iis7_shib\ShibUser.cpp" />
+    <ClCompile Include="..\..\iis\ShibHttpModule.cpp" />
+    <ClCompile Include="..\..\iis\ShibUser.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\iis7_shib\headers\IIS7Request.hpp" />
-    <ClInclude Include="..\..\iis7_shib\headers\IIS7_shib.hpp" />
-    <ClInclude Include="..\..\iis7_shib\headers\ShibHttpModule.hpp" />
-    <ClInclude Include="..\..\iis7_shib\headers\ShibUser.hpp" />
+    <ClInclude Include="..\..\iis\headers\IIS7Request.hpp" />
+    <ClInclude Include="..\..\iis\headers\iis.hpp" />
+    <ClInclude Include="..\..\iis\headers\ShibHttpModule.hpp" />
+    <ClInclude Include="..\..\iis\headers\ShibUser.hpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
@@ -120,34 +120,34 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis;$(SolutionDir)..\..\iis\headers;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>IIS_SHIB4</TargetName>
+    <TargetName>iis_shib4</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis;$(SolutionDir)..\..\iis\headers;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>IIS_SHIB4</TargetName>
+    <TargetName>iis_shib4</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis;$(SolutionDir)..\..\iis\headers;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>IIS_SHIB4</TargetName>
+    <TargetName>iis_shib4</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis;$(SolutionDir)..\..\iis\headers;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>IIS_SHIB4</TargetName>
+    <TargetName>iis_shib4</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis;$(SolutionDir)..\..\iis\headers;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>IIS_SHIB4</TargetName>
+    <TargetName>iis_shib4</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis;$(SolutionDir)..\..\iis\headers;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>IIS_SHIB4</TargetName>
+    <TargetName>iis_shib4</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/Projects/vc22/iis.vcxproj.filters b/Projects/vc22/iis.vcxproj.filters
index 5687c4b6..a88984fe 100644
--- a/Projects/vc22/iis.vcxproj.filters
+++ b/Projects/vc22/iis.vcxproj.filters
@@ -15,35 +15,35 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\iis7_shib\iis7_shib.rc">
+    <ResourceCompile Include="..\..\iis\iis.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\iis7_shib\IIS7Request.cpp">
+    <ClCompile Include="..\..\iis\IIS7Request.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\iis7_shib\register.cpp">
+    <ClCompile Include="..\..\iis\register.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\iis7_shib\ShibHttpModule.cpp">
+    <ClCompile Include="..\..\iis\ShibHttpModule.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\iis7_shib\ShibUser.cpp">
+    <ClCompile Include="..\..\iis\ShibUser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\iis7_shib\headers\IIS7_shib.hpp">
+    <ClInclude Include="..\..\iis\headers\iis.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\iis7_shib\headers\IIS7Request.hpp">
+    <ClInclude Include="..\..\iis\headers\IIS7Request.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\iis7_shib\headers\ShibHttpModule.hpp">
+    <ClInclude Include="..\..\iis\headers\ShibHttpModule.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\iis7_shib\headers\ShibUser.hpp">
+    <ClInclude Include="..\..\iis\headers\ShibUser.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/iis7_shib/IIS7Request.cpp b/iis/IIS7Request.cpp
similarity index 99%
rename from iis7_shib/IIS7Request.cpp
rename to iis/IIS7Request.cpp
index 27ea26bd..c8c1fc93 100644
--- a/iis7_shib/IIS7Request.cpp
+++ b/iis/IIS7Request.cpp
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-#include "IIS7_shib.hpp"
+#include "iis.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/iis7_shib/ShibHttpModule.cpp b/iis/ShibHttpModule.cpp
similarity index 99%
rename from iis7_shib/ShibHttpModule.cpp
rename to iis/ShibHttpModule.cpp
index 124a9731..7fce99d9 100644
--- a/iis7_shib/ShibHttpModule.cpp
+++ b/iis/ShibHttpModule.cpp
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-#include "IIS7_shib.hpp"
+#include "iis.hpp"
 
 #include "shibsp/io/HTTPResponse.h"
 
diff --git a/iis7_shib/ShibUser.cpp b/iis/ShibUser.cpp
similarity index 98%
rename from iis7_shib/ShibUser.cpp
rename to iis/ShibUser.cpp
index 3f0edf34..1dda8577 100644
--- a/iis7_shib/ShibUser.cpp
+++ b/iis/ShibUser.cpp
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-#include "IIS7_shib.hpp"
+#include "iis.hpp"
 #include "ShibUser.hpp"
 
 ShibUser::ShibUser(std::wstring name, set<wstring> roles) : m_refCount(1), m_roles(roles), m_username(name)
diff --git a/iis7_shib/headers/IIS7Request.hpp b/iis/headers/IIS7Request.hpp
similarity index 100%
rename from iis7_shib/headers/IIS7Request.hpp
rename to iis/headers/IIS7Request.hpp
diff --git a/iis7_shib/headers/ShibHttpModule.hpp b/iis/headers/ShibHttpModule.hpp
similarity index 98%
rename from iis7_shib/headers/ShibHttpModule.hpp
rename to iis/headers/ShibHttpModule.hpp
index f4693e1e..8e46f5bd 100644
--- a/iis7_shib/headers/ShibHttpModule.hpp
+++ b/iis/headers/ShibHttpModule.hpp
@@ -13,7 +13,7 @@
  */
 
 #pragma once
-#include "IIS7_shib.hpp"
+#include "iis.hpp"
 
 class ShibHttpModule : public CHttpModule {
 public:
diff --git a/iis7_shib/headers/ShibUser.hpp b/iis/headers/ShibUser.hpp
similarity index 100%
rename from iis7_shib/headers/ShibUser.hpp
rename to iis/headers/ShibUser.hpp
diff --git a/iis7_shib/headers/IIS7_shib.hpp b/iis/headers/iis.hpp
similarity index 100%
rename from iis7_shib/headers/IIS7_shib.hpp
rename to iis/headers/iis.hpp
diff --git a/iis7_shib/iis7_shib.rc b/iis/iis.rc
similarity index 80%
rename from iis7_shib/iis7_shib.rc
rename to iis/iis.rc
index fa3b8a8d..7c200a88 100644
--- a/iis7_shib/iis7_shib.rc
+++ b/iis/iis.rc
@@ -31,9 +31,9 @@ BEGIN
         BLOCK "080904b0"
         BEGIN
 #include "..\util\resourceCommon.rci"
-            VALUE "FileDescription", "Shibboleth IIS Module"
-            VALUE "InternalName", "iis7_shib"
-            VALUE "OriginalFilename", "iis7_shib.dll"
+            VALUE "FileDescription", "Shibboleth 4 IIS Module"
+            VALUE "InternalName", "iis_shib4"
+            VALUE "OriginalFilename", "iis_shib4.dll"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/iis7_shib/register.cpp b/iis/register.cpp
similarity index 99%
rename from iis7_shib/register.cpp
rename to iis/register.cpp
index 690b95ff..59c44b9e 100644
--- a/iis7_shib/register.cpp
+++ b/iis/register.cpp
@@ -18,7 +18,7 @@
 #define _SCL_SECURE_NO_WARNINGS 1
 
 // Project
-#include "IIS7_shib.hpp"
+#include "iis.hpp"
 #include "ShibHttpModule.hpp"
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/shibsp/session/impl/AbstractSessionCache.cpp b/shibsp/session/impl/AbstractSessionCache.cpp
index 19142971..e1f3b683 100644
--- a/shibsp/session/impl/AbstractSessionCache.cpp
+++ b/shibsp/session/impl/AbstractSessionCache.cpp
@@ -621,7 +621,7 @@ bool AbstractSessionCache::update(SPRequest& request, unique_lock<Session>& sess
             return false;
         }
     }
-    catch (const exception& e) {
+    catch (const exception&) {
         // Should be logged by the SPI.
         data.destroy();
         throw;

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

More information about the commits mailing list