[cpp-sp COMMIT] in /branches/REL_2: .gitignore Shibboleth.sln apache/Makefile.am apache/mod_apache.cpp apache/mod_shi...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar 21 22:17:02 2012
New Revision: 3595

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3595&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-430

Added:
    branches/REL_2/apache/mod_shib24.vcxproj
    branches/REL_2/apache/mod_shib_24.cpp
    branches/REL_2/apache/mod_shib_24.rc
    branches/REL_2/configs/apache24.config.in
Modified:
    branches/REL_2/.gitignore
    branches/REL_2/Shibboleth.sln
    branches/REL_2/apache/Makefile.am
    branches/REL_2/apache/mod_apache.cpp
    branches/REL_2/configs/Makefile.am
    branches/REL_2/configure.ac
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3595&r1=3594&r2=3595&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Wed Mar 21 22:17:02 2012
@@ -62,8 +62,10 @@
 /apache/*.user
 /apache/mod_shib_20-Debug
 /apache/mod_shib_22-Debug
+/apache/mod_shib_24-Debug
 /apache/mod_shib_22-Release
 /apache/mod_shib_20-Release
+/apache/mod_shib_24-Release
 /apache/x64
 
 # /configs/
@@ -71,6 +73,8 @@
 /configs/Makefile.in
 /configs/apache.config
 /configs/apache2.config
+/configs/apache22.config
+/configs/apache24.config
 /configs/shar.logger
 /configs/shire.logger
 /configs/shibboleth.ini

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3595&r1=3594&r2=3595&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Wed Mar 21 22:17:02 2012
@@ -35,7 +35,7 @@
 		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
 		configs\attribute-policy.xml = configs\attribute-policy.xml
@@ -130,6 +130,8 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memcache-store", "memcache-store\memcache-store.vcxproj", "{666A63A7-983F-4C19-8411-207F24305198}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins", "plugins\plugins.vcxproj", "{A2140D6E-C2C6-4329-84E3-2F530CEBE445}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib_24", "apache\mod_shib24.vcxproj", "{B44C0852-83B8-4FB2-A86E-097C9C8256D1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -265,6 +267,14 @@
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|Win32.Build.0 = Release|Win32
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|x64.ActiveCfg = Release|x64
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|x64.Build.0 = Release|x64
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Debug|Win32.Build.0 = Debug|Win32
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Debug|x64.ActiveCfg = Debug|x64
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Debug|x64.Build.0 = Debug|x64
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|Win32.ActiveCfg = Release|Win32
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|Win32.Build.0 = Release|Win32
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|x64.ActiveCfg = Release|x64
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -276,6 +286,7 @@
 		{68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{1396D80A-8672-4224-9B02-95F3F4207CDB} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}

Modified: branches/REL_2/apache/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/apache/Makefile.am?rev=3595&r1=3594&r2=3595&view=diff
==============================================================================
--- branches/REL_2/apache/Makefile.am (original)
+++ branches/REL_2/apache/Makefile.am Wed Mar 21 22:17:02 2012
@@ -42,6 +42,21 @@
 
 endif
 
-EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp \
-	mod_shib13.vcxproj mod_shib20.vcxproj mod_shib22.vcxproj \
-	resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc
+if BUILD_AP24
+modshib24dir = $(libdir)/@PACKAGE@
+modshib24_LTLIBRARIES = mod_shib_24.la
+mod_shib_24_la_SOURCES = mod_shib_24.cpp
+mod_shib_24_la_CXXFLAGS = $(APXS24_CFLAGS) -I$(APXS24_INCLUDE)

[... 2980 lines stripped ...]