[shibboleth-sp2] 76/89: Merge branch 'master' of shibboleth.net:cpp-sp

[Ferenc Wágner]

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

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit 2c373cf129074b5532733e922cfc9bb13d440053
Merge: ec5a217 54c5087
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Fri Jun 24 14:03:07 2016 -0400

    Merge branch 'master' of shibboleth.net:cpp-sp

 Projects/vc10/Shibboleth.sln                       |  29 +++-
 Projects/vc10/Wix/Installer.vcxproj                |  18 +-
 Projects/vc10/Wix/MergeModules.vcxproj             |   4 +-
 Projects/vc10/isapi_shib/isapi_shib.vcxproj        |   8 +-
 Projects/vc10/shibd/shibd.vcxproj                  |  12 +-
 Projects/vc10/util/messages.vcxproj                | 180 ++++++++++++++++++++
 Projects/vc10/util/messages.vcxproj.filters        |  27 +++
 Projects/vc14/Shibboleth.sln                       |  29 +++-
 Projects/vc14/Wix/Installer.vcxproj                |   8 +-
 Projects/vc14/util/messages.vcxproj                | 184 +++++++++++++++++++++
 Projects/vc14/util/messages.vcxproj.filters        |  25 +++
 adfs/adfs.cpp                                      |  17 +-
 configs/attribute-policy.xml                       |   4 +-
 isapi_shib/isapi_shib.cpp                          |  55 +++---
 msi/WiX/Installer.make                             |  20 +--
 msi/WiX/MergeModules/MergeModules.make             |  28 ++--
 msi/WiX/MergeModules/OpenSAML-x86.wxs              |   4 +-
 msi/WiX/MergeModules/Shibboleth-x64.wxs            |   8 +-
 msi/WiX/MergeModules/Shibboleth-x86.wxs            |   8 +-
 msi/WiX/ShibbolethSP-defs-x86.wxi                  |   2 -
 msi/WiX/ShibbolethSP-exe-x64.wxs                   |  12 +-
 msi/WiX/ShibbolethSP-exe-x86.wxs                   |  12 +-
 msi/WiX/ShibbolethSP-main-x64.wxs                  |  21 +++
 msi/WiX/ShibbolethSP-main-x86.wxs                  |  21 +++
 schemas/shibboleth-2.0-afp.xsd                     |  19 ++-
 schemas/shibboleth-2.0-native-sp-config.xsd        |  12 +-
 shibd/shibd_win32.cpp                              |  16 +-
 shibsp/ServiceProvider.cpp                         | 160 +++++++++++-------
 shibsp/attribute/Attribute.cpp                     |   3 +-
 shibsp/attribute/filtering/impl/MatchFunctor.cpp   |   2 +-
 .../filtering/impl/XMLAttributeFilter.cpp          |   7 +
 shibsp/binding/impl/XMLProtocolProvider.cpp        |  14 ++
 shibsp/handler/impl/SAML2SessionInitiator.cpp      | 107 ++++++++++--
 shibsp/impl/XMLAccessControl.cpp                   |  25 ++-
 shibsp/impl/XMLRequestMapper.cpp                   |  19 ++-
 shibsp/metadata/DynamicMetadataProvider.cpp        |  20 ++-
 util/message.mc                                    | 183 ++++++++++++++++++++
 util/messageResource.rc                            | Bin 0 -> 52 bytes
 38 files changed, 1101 insertions(+), 222 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git