Pull in Apache 2.2 module.
authorScott Cantor <cantor.2@osu.edu>
Thu, 30 Nov 2006 21:08:21 +0000 (21:08 +0000)
committerScott Cantor <cantor.2@osu.edu>
Thu, 30 Nov 2006 21:08:21 +0000 (21:08 +0000)
1  2 
apache/Makefile.am
apache/mod_apache.cpp
apache/mod_shib13.vcproj
apache/mod_shib20.vcproj
apache/mod_shib22.vcproj

diff --combined apache/Makefile.am
@@@ -32,5 -32,21 +32,21 @@@ install-exec-hook
  
  endif
  
- EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib13.vcproj mod_shib20.vcproj \
-       resource.h mod_shib_13.rc mod_shib_20.rc
+ if BUILD_AP22
+ modshib22dir = $(libexecdir)
+ modshib22_LTLIBRARIES = mod_shib_22.la
+ mod_shib_22_la_SOURCES = mod_shib_22.cpp
+ mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE)
+ mod_shib_22_la_LDFLAGS = -module -avoid-version
+ mod_shib_22_la_LIBADD = \
+   $(top_builddir)/shib/libshib.la \
+   $(top_builddir)/shib-target/libshib-target.la
+ install-exec-hook:
+       for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done
+ endif
+ EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp \
 -      mod_shib13.dsp mod_shib20.dsp mod_shib22.dsp \
++      mod_shib13.vcproj mod_shib20.vcproj mod_shib22.vcproj \
+       resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc
diff --combined apache/mod_apache.cpp
  #undef _XOPEN_SOURCE    // causes gethostname conflict in unistd.h
  #endif
  
 +#ifdef WIN32
 +# define _CRT_NONSTDC_NO_DEPRECATE 1
 +# define _CRT_SECURE_NO_DEPRECATE 1
 +#endif
 +
  // SAML Runtime
  #include <saml/saml.h>
  #include <shib/shib.h>
  #include <shib-target/shib-target.h>
  #include <xercesc/util/regx/RegularExpression.hpp>
  
 +#ifdef WIN32
 +# include <winsock.h>
 +#endif
 +
  #undef _XPG4_2
  
  // Apache specific header files
@@@ -77,6 -68,7 +77,7 @@@ namespace 
      char* g_szSHIBConfig = NULL;
      char* g_szSchemaDir = NULL;
      ShibTargetConfig* g_Config = NULL;
+     string g_unsetHeaderValue;
      static const char* g_UserDataKey = "_shib_check_user_";
  }
  
@@@ -201,7 -193,7 +202,7 @@@ extern "C" const char* ap_set_global_st
  extern "C" const char* shib_set_server_string_slot(cmd_parms* parms, void*, const char* arg)
  {
      char* base=(char*)ap_get_module_config(parms->server->module_config,&mod_shib);
 -    int offset=(int)parms->info;
 +    size_t offset=(size_t)parms->info;
      *((char**)(base + offset))=ap_pstrdup(parms->pool,arg);
      return NULL;
  }
@@@ -223,15 -215,8 +224,15 @@@ extern "C" const char* shib_ap_set_file
  
  class ShibTargetApache : public ShibTarget
  {
 +  mutable string m_body;
 +  mutable bool m_gotBody;
 +
  public:
 -  ShibTargetApache(request_rec* req) {
 +  request_rec* m_req;
 +  shib_dir_config* m_dc;
 +  shib_server_config* m_sc;
 +
 +  ShibTargetApache(request_rec* req) : m_gotBody(false) {
      m_sc = (shib_server_config*)ap_get_module_config(req->server->module_config, &mod_shib);
      m_dc = (shib_dir_config*)ap_get_module_config(req->per_dir_config, &mod_shib);
  
  
      m_req = req;
    }
 -  ~ShibTargetApache() { }
 +  virtual ~ShibTargetApache() {}
  
    virtual void log(ShibLogLevel level, const string &msg) {
      ShibTarget::log(level,msg);
      char* val = ap_psprintf(m_req->pool, "%s=%s", name.c_str(), value.c_str());
      ap_table_addn(m_req->err_headers_out, "Set-Cookie", val);
    }
 -  virtual string getArgs(void) { return string(m_req->args ? m_req->args : ""); }
 -  virtual string getPostData(void) {
 +  virtual const char* getQueryString() const { return m_req->args; }
 +  virtual const char* getRequestBody() const {
 +    if (m_gotBody)
 +        return m_body.c_str();
      // Read the posted data
      if (ap_setup_client_block(m_req, REQUEST_CHUNKED_ERROR))
 -        throw FatalProfileException("Apache function (setup_client_block) failed while reading profile submission.");
 +        throw SAMLException("Apache function (setup_client_block) failed while reading POST request body.");
      if (!ap_should_client_block(m_req))
 -        throw FatalProfileException("Apache function (should_client_block) failed while reading profile submission.");
 +        throw SAMLException("Apache function (should_client_block) failed while reading POST request body.");
      if (m_req->remaining > 1024*1024)
 -        throw FatalProfileException("Blocked too-large a submission to profile endpoint.");
 -    string cgistr;
 +        throw SAMLException("Blocked POST request body larger than size limit.");
 +    m_gotBody=true;
      char buff[HUGE_STRING_LEN];
 -    ap_hard_timeout("[mod_shib] getPostData", m_req);
 +    ap_hard_timeout("[mod_shib] getRequestBody", m_req);
      memset(buff, 0, sizeof(buff));
      while (ap_get_client_block(m_req, buff, sizeof(buff)-1) > 0) {
        ap_reset_timeout(m_req);
 -      cgistr += buff;
 +      m_body += buff;
        memset(buff, 0, sizeof(buff));
      }
      ap_kill_timeout(m_req);
 -
 -    return cgistr;
 +    return m_body.c_str();
    }
    virtual void clearHeader(const string &name) {
      ap_table_unset(m_req->headers_in, name.c_str());
+     ap_table_set(m_req->headers_in, name.c_str(), g_unsetHeaderValue.c_str());
    }
    virtual void setHeader(const string &name, const string &value) {
      ap_table_set(m_req->headers_in, name.c_str(), value.c_str());
    }
    virtual void* returnDecline(void) { return (void*)DECLINED; }
    virtual void* returnOK(void) { return (void*)OK; }
 -
 -  request_rec* m_req;
 -  shib_dir_config* m_dc;
 -  shib_server_config* m_sc;
  };
  
  /********************************************************************************/
@@@ -790,7 -779,7 +792,7 @@@ bool htAccessControl::authorized
                      }
                      
                      string vals_str(vals);
 -                    unsigned int j = 0;
 +                    int j = 0;
                      for (unsigned int i = 0;  i < vals_str.length();  i++) {
                          if (vals_str.at(i) == ';') {
                              if (i == 0) {
@@@ -929,12 -918,11 +931,12 @@@ extern "C" void shib_child_init(apr_poo
      try {
          g_Config=&ShibTargetConfig::getConfig();
          g_Config->setFeatures(
 +            ShibTargetConfig::Caching |
              ShibTargetConfig::Listener |
              ShibTargetConfig::Metadata |
              ShibTargetConfig::AAP |
              ShibTargetConfig::RequestMapper |
 -            ShibTargetConfig::LocalExtensions |
 +            ShibTargetConfig::InProcess |
              ShibTargetConfig::Logging
              );
          if (!g_Config->init(g_szSchemaDir)) {
              ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to load configuration");
              exit(1);
          }
+         IConfig* conf=g_Config->getINI();
+         Locker locker(conf);
+         const IPropertySet* props=conf->getPropertySet("Local");
+         if (props) {
+             pair<bool,const char*> unsetValue=props->getString("unsetHeaderValue");
+             if (unsetValue.first)
+                 g_unsetHeaderValue = unsetValue.second;
+         }
      }
      catch (...) {
          ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to initialize system");
@@@ -969,6 -966,8 +980,6 @@@ typedef const char* (*config_fn_t)(void
  // SHIB Module commands
  
  static command_rec shire_cmds[] = {
 -  {"SHIREConfig", (config_fn_t)ap_set_global_string_slot, &g_szSHIBConfig,
 -   RSRC_CONF, TAKE1, "Path to shibboleth.xml config file"},
    {"ShibConfig", (config_fn_t)ap_set_global_string_slot, &g_szSHIBConfig,
     RSRC_CONF, TAKE1, "Path to shibboleth.xml config file"},
    {"ShibSchemaDir", (config_fn_t)ap_set_global_string_slot, &g_szSchemaDir,
@@@ -1037,7 -1036,7 +1048,7 @@@ module MODULE_VAR_EXPORT mod_shib = 
      NULL                      /* post read-request */
  };
  
- #elif defined(SHIB_APACHE_20)
+ #elif defined(SHIB_APACHE_20) || defined(SHIB_APACHE_22)
  
  extern "C" void shib_register_hooks (apr_pool_t *p)
  {
diff --combined apache/mod_shib13.vcproj
index 8ee0e42,0000000..15b13c3
mode 100644,000000..100644
--- /dev/null
@@@ -1,273 -1,0 +1,273 @@@
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache\include"
 +<?xml version="1.0" encoding="Windows-1252"?>
 +<VisualStudioProject
 +      ProjectType="Visual C++"
 +      Version="8.00"
 +      Name="mod_shib13"
 +      ProjectGUID="{D243B43E-728E-4F32-BDFF-B3A897037C6D}"
 +      >
 +      <Platforms>
 +              <Platform
 +                      Name="Win32"
 +              />
 +      </Platforms>
 +      <ToolFiles>
 +      </ToolFiles>
 +      <Configurations>
 +              <Configuration
 +                      Name="Release|Win32"
 +                      OutputDirectory=".\Release"
 +                      IntermediateDirectory=".\Release"
 +                      ConfigurationType="2"
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 +                      UseOfMFC="0"
 +                      ATLMinimizesCRunTimeLibraryUsage="false"
 +                      CharacterSet="2"
 +                      >
 +                      <Tool
 +                              Name="VCPreBuildEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCCustomBuildTool"
 +                      />
 +                      <Tool
 +                              Name="VCXMLDataGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebServiceProxyGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCMIDLTool"
 +                              PreprocessorDefinitions="NDEBUG"
 +                              MkTypLibCompatible="true"
 +                              SuppressStartupBanner="true"
 +                              TargetEnvironment="1"
 +                              TypeLibraryName=".\Release/mod_shib13.tlb"
 +                              HeaderFileName=""
 +                      />
 +                      <Tool
 +                              Name="VCCLCompilerTool"
 +                              Optimization="2"
 +                              InlineFunctionExpansion="1"
 +                              AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache\include"
 +                              PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EAPI"
 +                              StringPooling="true"
 +                              RuntimeLibrary="2"
 +                              EnableFunctionLevelLinking="true"
 +                              RuntimeTypeInfo="true"
 +                              UsePrecompiledHeader="0"
 +                              PrecompiledHeaderFile=".\Release/mod_shib13.pch"
 +                              AssemblerListingLocation=".\Release/"
 +                              ObjectFile=".\Release/"
 +                              ProgramDataBaseFileName=".\Release/"
 +                              WarningLevel="3"
 +                              SuppressStartupBanner="true"
 +                              Detect64BitPortabilityProblems="true"
 +                              CompileAs="0"
 +                      />
 +                      <Tool
 +                              Name="VCManagedResourceCompilerTool"
 +                      />
 +                      <Tool
 +                              Name="VCResourceCompilerTool"
 +                              PreprocessorDefinitions="NDEBUG"
 +                              Culture="1033"
 +                      />
 +                      <Tool
 +                              Name="VCPreLinkEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCLinkerTool"
 +                              AdditionalDependencies="log4cpp.lib xerces-c_2.lib ApacheCore.lib saml_5.lib"
 +                              OutputFile="Release/mod_shib_13.so"
 +                              LinkIncremental="1"
 +                              SuppressStartupBanner="true"
 +                              AdditionalLibraryDirectories="../../../opensaml/c/saml/Release,\Apache\libexec"
 +                              ProgramDatabaseFile=".\Release/mod_shib_13.pdb"
 +                              ImportLibrary=".\Release/mod_shib_13.lib"
 +                              TargetMachine="1"
 +                      />
 +                      <Tool
 +                              Name="VCALinkTool"
 +                      />
 +                      <Tool
 +                              Name="VCManifestTool"
 +                      />
 +                      <Tool
 +                              Name="VCXDCMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCBscMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCFxCopTool"
 +                      />
 +                      <Tool
 +                              Name="VCAppVerifierTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebDeploymentTool"
 +                      />
 +                      <Tool
 +                              Name="VCPostBuildEventTool"
 +                      />
 +              </Configuration>
 +              <Configuration
 +                      Name="Debug|Win32"
 +                      OutputDirectory=".\Debug"
 +                      IntermediateDirectory=".\Debug"
 +                      ConfigurationType="2"
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 +                      UseOfMFC="0"
 +                      ATLMinimizesCRunTimeLibraryUsage="false"
 +                      CharacterSet="2"
 +                      >
 +                      <Tool
 +                              Name="VCPreBuildEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCCustomBuildTool"
 +                      />
 +                      <Tool
 +                              Name="VCXMLDataGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebServiceProxyGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCMIDLTool"
 +                              PreprocessorDefinitions="_DEBUG"
 +                              MkTypLibCompatible="true"
 +                              SuppressStartupBanner="true"
 +                              TargetEnvironment="1"
 +                              TypeLibraryName=".\Debug/mod_shib13.tlb"
 +                              HeaderFileName=""
 +                      />
 +                      <Tool
 +                              Name="VCCLCompilerTool"
 +                              Optimization="0"
++                              AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;\Apache\include"
 +                              PreprocessorDefinitions="_WINDOWS;EAPI;WIN32;_DEBUG"
 +                              BasicRuntimeChecks="3"
 +                              RuntimeLibrary="3"
 +                              RuntimeTypeInfo="true"
 +                              UsePrecompiledHeader="0"
 +                              PrecompiledHeaderFile=".\Debug/mod_shib13.pch"
 +                              AssemblerListingLocation=".\Debug/"
 +                              ObjectFile=".\Debug/"
 +                              ProgramDataBaseFileName=".\Debug/"
 +                              BrowseInformation="1"
 +                              WarningLevel="3"
 +                              SuppressStartupBanner="true"
 +                              Detect64BitPortabilityProblems="true"
 +                              DebugInformationFormat="4"
 +                              CompileAs="0"
 +                      />
 +                      <Tool
 +                              Name="VCManagedResourceCompilerTool"
 +                      />
 +                      <Tool
 +                              Name="VCResourceCompilerTool"
 +                              PreprocessorDefinitions="_DEBUG"
 +                              Culture="1033"
 +                      />
 +                      <Tool
 +                              Name="VCPreLinkEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCLinkerTool"
 +                              AdditionalDependencies="log4cppD.lib xerces-c_2D.lib ApacheCore.lib saml_5D.lib"
 +                              OutputFile="Debug/mod_shib_13.so"
 +                              LinkIncremental="2"
 +                              SuppressStartupBanner="true"
 +                              AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\Apache\libexec"
 +                              GenerateDebugInformation="true"
 +                              ImportLibrary=".\Debug/mod_shib_13.lib"
 +                              TargetMachine="1"
 +                      />
 +                      <Tool
 +                              Name="VCALinkTool"
 +                      />
 +                      <Tool
 +                              Name="VCManifestTool"
 +                      />
 +                      <Tool
 +                              Name="VCXDCMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCBscMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCFxCopTool"
 +                      />
 +                      <Tool
 +                              Name="VCAppVerifierTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebDeploymentTool"
 +                      />
 +                      <Tool
 +                              Name="VCPostBuildEventTool"
 +                      />
 +              </Configuration>
 +      </Configurations>
 +      <References>
 +      </References>
 +      <Files>
 +              <File
 +                      RelativePath=".\mod_apache.cpp"
 +                      >
 +                      <FileConfiguration
 +                              Name="Release|Win32"
 +                              ExcludedFromBuild="true"
 +                              >
 +                              <Tool
 +                                      Name="VCCLCompilerTool"
 +                              />
 +                      </FileConfiguration>
 +                      <FileConfiguration
 +                              Name="Debug|Win32"
 +                              ExcludedFromBuild="true"
 +                              >
 +                              <Tool
 +                                      Name="VCCLCompilerTool"
 +                              />
 +                      </FileConfiguration>
 +              </File>
 +              <File
 +                      RelativePath="mod_shib_13.cpp"
 +                      >
 +                      <FileConfiguration
 +                              Name="Release|Win32"
 +                              >
 +                              <Tool
 +                                      Name="VCCLCompilerTool"
 +                                      Optimization="2"
 +                                      AdditionalIncludeDirectories=""
 +                                      PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;EAPI;$(NoInherit)"
 +                              />
 +                      </FileConfiguration>
 +                      <FileConfiguration
 +                              Name="Debug|Win32"
 +                              >
 +                              <Tool
 +                                      Name="VCCLCompilerTool"
 +                                      Optimization="0"
 +                                      AdditionalIncludeDirectories=""
 +                                      PreprocessorDefinitions="_WINDOWS;EAPI;WIN32;_DEBUG;_MBCS;$(NoInherit)"
 +                                      BasicRuntimeChecks="3"
 +                                      BrowseInformation="1"
 +                              />
 +                      </FileConfiguration>
 +              </File>
 +              <File
 +                      RelativePath="mod_shib_13.rc"
 +                      >
 +              </File>
 +              <File
 +                      RelativePath="resource.h"
 +                      >
 +              </File>
 +      </Files>
 +      <Globals>
 +      </Globals>
 +</VisualStudioProject>
diff --combined apache/mod_shib20.vcproj
index 7edb485,0000000..faad9dc
mode 100644,000000..100644
--- /dev/null
@@@ -1,253 -1,0 +1,253 @@@
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache2\include"
 +<?xml version="1.0" encoding="Windows-1252"?>
 +<VisualStudioProject
 +      ProjectType="Visual C++"
 +      Version="8.00"
 +      Name="mod_shib20"
 +      ProjectGUID="{68E9568B-476C-4289-B93C-893432378ADC}"
 +      >
 +      <Platforms>
 +              <Platform
 +                      Name="Win32"
 +              />
 +      </Platforms>
 +      <ToolFiles>
 +      </ToolFiles>
 +      <Configurations>
 +              <Configuration
 +                      Name="Release|Win32"
 +                      OutputDirectory=".\mod_shib20___Win32_Release"
 +                      IntermediateDirectory=".\mod_shib20___Win32_Release"
 +                      ConfigurationType="2"
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 +                      UseOfMFC="0"
 +                      ATLMinimizesCRunTimeLibraryUsage="false"
 +                      CharacterSet="2"
 +                      >
 +                      <Tool
 +                              Name="VCPreBuildEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCCustomBuildTool"
 +                      />
 +                      <Tool
 +                              Name="VCXMLDataGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebServiceProxyGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCMIDLTool"
 +                              PreprocessorDefinitions="NDEBUG"
 +                              MkTypLibCompatible="true"
 +                              SuppressStartupBanner="true"
 +                              TargetEnvironment="1"
 +                              TypeLibraryName=".\mod_shib20___Win32_Release/mod_shib20.tlb"
 +                              HeaderFileName=""
 +                      />
 +                      <Tool
 +                              Name="VCCLCompilerTool"
 +                              Optimization="2"
 +                              InlineFunctionExpansion="1"
 +                              AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache2\include"
 +                              PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 +                              StringPooling="true"
 +                              RuntimeLibrary="2"
 +                              EnableFunctionLevelLinking="true"
 +                              RuntimeTypeInfo="true"
 +                              UsePrecompiledHeader="0"
 +                              PrecompiledHeaderFile=".\mod_shib20___Win32_Release/mod_shib20.pch"
 +                              AssemblerListingLocation=".\mod_shib20___Win32_Release/"
 +                              ObjectFile=".\mod_shib20___Win32_Release/"
 +                              ProgramDataBaseFileName=".\mod_shib20___Win32_Release/"
 +                              WarningLevel="3"
 +                              SuppressStartupBanner="true"
 +                              Detect64BitPortabilityProblems="true"
 +                              CompileAs="0"
 +                      />
 +                      <Tool
 +                              Name="VCManagedResourceCompilerTool"
 +                      />
 +                      <Tool
 +                              Name="VCResourceCompilerTool"
 +                              PreprocessorDefinitions="NDEBUG"
 +                              Culture="1033"
 +                      />
 +                      <Tool
 +                              Name="VCPreLinkEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCLinkerTool"
 +                              AdditionalDependencies="log4cpp.lib xerces-c_2.lib libapr.lib libhttpd.lib saml_5.lib"
 +                              OutputFile="mod_shib20___Win32_Release/mod_shib_20.so"
 +                              LinkIncremental="1"
 +                              SuppressStartupBanner="true"
 +                              AdditionalLibraryDirectories="../../../opensaml/c/saml/Release,\httpd-2.0.52\srclib\apr\Release,\httpd-2.0.52\Release"
 +                              ProgramDatabaseFile=".\mod_shib20___Win32_Release/mod_shib_20.pdb"
 +                              ImportLibrary=".\mod_shib20___Win32_Release/mod_shib_20.lib"
 +                              TargetMachine="1"
 +                      />
 +                      <Tool
 +                              Name="VCALinkTool"
 +                      />
 +                      <Tool
 +                              Name="VCManifestTool"
 +                      />
 +                      <Tool
 +                              Name="VCXDCMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCBscMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCFxCopTool"
 +                      />
 +                      <Tool
 +                              Name="VCAppVerifierTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebDeploymentTool"
 +                      />
 +                      <Tool
 +                              Name="VCPostBuildEventTool"
 +                      />
 +              </Configuration>
 +              <Configuration
 +                      Name="Debug|Win32"
 +                      OutputDirectory=".\mod_shib20___Win32_Debug"
 +                      IntermediateDirectory=".\mod_shib20___Win32_Debug"
 +                      ConfigurationType="2"
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 +                      UseOfMFC="0"
 +                      ATLMinimizesCRunTimeLibraryUsage="false"
 +                      CharacterSet="2"
 +                      >
 +                      <Tool
 +                              Name="VCPreBuildEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCCustomBuildTool"
 +                      />
 +                      <Tool
 +                              Name="VCXMLDataGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebServiceProxyGeneratorTool"
 +                      />
 +                      <Tool
 +                              Name="VCMIDLTool"
 +                              PreprocessorDefinitions="_DEBUG"
 +                              MkTypLibCompatible="true"
 +                              SuppressStartupBanner="true"
 +                              TargetEnvironment="1"
 +                              TypeLibraryName=".\mod_shib20___Win32_Debug/mod_shib20.tlb"
 +                              HeaderFileName=""
 +                      />
 +                      <Tool
 +                              Name="VCCLCompilerTool"
 +                              Optimization="0"
++                              AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;\Apache2\include"
 +                              PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
 +                              BasicRuntimeChecks="3"
 +                              RuntimeLibrary="3"
 +                              RuntimeTypeInfo="true"
 +                              UsePrecompiledHeader="0"
 +                              PrecompiledHeaderFile=".\mod_shib20___Win32_Debug/mod_shib20.pch"
 +                              AssemblerListingLocation=".\mod_shib20___Win32_Debug/"
 +                              ObjectFile=".\mod_shib20___Win32_Debug/"
 +                              ProgramDataBaseFileName=".\mod_shib20___Win32_Debug/"
 +                              BrowseInformation="1"
 +                              WarningLevel="3"
 +                              SuppressStartupBanner="true"
 +                              Detect64BitPortabilityProblems="true"
 +                              DebugInformationFormat="4"
 +                              CompileAs="0"
 +                      />
 +                      <Tool
 +                              Name="VCManagedResourceCompilerTool"
 +                      />
 +                      <Tool
 +                              Name="VCResourceCompilerTool"
 +                              PreprocessorDefinitions="_DEBUG"
 +                              Culture="1033"
 +                      />
 +                      <Tool
 +                              Name="VCPreLinkEventTool"
 +                      />
 +                      <Tool
 +                              Name="VCLinkerTool"
 +                              AdditionalDependencies="log4cppD.lib xerces-c_2D.lib libapr.lib libhttpd.lib saml_5D.lib"
 +                              OutputFile="mod_shib20___Win32_Debug/mod_shib_20.so"
 +                              LinkIncremental="2"
 +                              SuppressStartupBanner="true"
 +                              AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\httpd-2.0.52\srclib\apr\Debug,\httpd-2.0.52\Debug"
 +                              GenerateDebugInformation="true"
 +                              ImportLibrary=".\mod_shib20___Win32_Debug/mod_shib_20.lib"
 +                              TargetMachine="1"
 +                      />
 +                      <Tool
 +                              Name="VCALinkTool"
 +                      />
 +                      <Tool
 +                              Name="VCManifestTool"
 +                      />
 +                      <Tool
 +                              Name="VCXDCMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCBscMakeTool"
 +                      />
 +                      <Tool
 +                              Name="VCFxCopTool"
 +                      />
 +                      <Tool
 +                              Name="VCAppVerifierTool"
 +                      />
 +                      <Tool
 +                              Name="VCWebDeploymentTool"
 +                      />
 +                      <Tool
 +                              Name="VCPostBuildEventTool"
 +                      />
 +              </Configuration>
 +      </Configurations>
 +      <References>
 +      </References>
 +      <Files>
 +              <File
 +                      RelativePath="mod_shib_20.cpp"
 +                      >
 +                      <FileConfiguration
 +                              Name="Release|Win32"
 +                              >
 +                              <Tool
 +                                      Name="VCCLCompilerTool"
 +                                      Optimization="2"
 +                                      AdditionalIncludeDirectories=""
 +                                      PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;$(NoInherit)"
 +                              />
 +                      </FileConfiguration>
 +                      <FileConfiguration
 +                              Name="Debug|Win32"
 +                              >
 +                              <Tool
 +                                      Name="VCCLCompilerTool"
 +                                      Optimization="0"
 +                                      AdditionalIncludeDirectories=""
 +                                      PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;_MBCS;$(NoInherit)"
 +                                      BasicRuntimeChecks="3"
 +                                      BrowseInformation="1"
 +                              />
 +                      </FileConfiguration>
 +              </File>
 +              <File
 +                      RelativePath="mod_shib_20.rc"
 +                      >
 +              </File>
 +              <File
 +                      RelativePath="resource.h"
 +                      >
 +              </File>
 +      </Files>
 +      <Globals>
 +      </Globals>
 +</VisualStudioProject>
diff --combined apache/mod_shib22.vcproj
index 0000000,0000000..a00d3e8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,267 @@@
++<?xml version="1.0" encoding="Windows-1252"?>\r
++<VisualStudioProject\r
++      ProjectType="Visual C++"\r
++      Version="8.00"\r
++      Name="mod_shib22"\r
++      ProjectGUID="{B44C0852-83B8-4FB2-A86E-097C9C8256D0}"\r
++      >\r
++      <Platforms>\r
++              <Platform\r
++                      Name="Win32"\r
++              />\r
++      </Platforms>\r
++      <ToolFiles>\r
++      </ToolFiles>\r
++      <Configurations>\r
++              <Configuration\r
++                      Name="Release|Win32"\r
++                      OutputDirectory=".\mod_shib22___Win32_Release"\r
++                      IntermediateDirectory=".\mod_shib22___Win32_Release"\r
++                      ConfigurationType="2"\r
++                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
++                      UseOfMFC="0"\r
++                      ATLMinimizesCRunTimeLibraryUsage="false"\r
++                      CharacterSet="2"\r
++                      >\r
++                      <Tool\r
++                              Name="VCPreBuildEventTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCCustomBuildTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCXMLDataGeneratorTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCWebServiceProxyGeneratorTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCMIDLTool"\r
++                              PreprocessorDefinitions="NDEBUG"\r
++                              MkTypLibCompatible="true"\r
++                              SuppressStartupBanner="true"\r
++                              TargetEnvironment="1"\r
++                              TypeLibraryName=".\mod_shib22___Win32_Release/mod_shib22.tlb"\r
++                              HeaderFileName=""\r
++                      />\r
++                      <Tool\r
++                              Name="VCCLCompilerTool"\r
++                              Optimization="2"\r
++                              InlineFunctionExpansion="1"\r
++                              AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache22\include"\r
++                              PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"\r
++                              StringPooling="true"\r
++                              RuntimeLibrary="2"\r
++                              EnableFunctionLevelLinking="true"\r
++                              RuntimeTypeInfo="true"\r
++                              PrecompiledHeaderFile=".\mod_shib22___Win32_Release/mod_shib22.pch"\r
++                              AssemblerListingLocation=".\mod_shib22___Win32_Release/"\r
++                              ObjectFile=".\mod_shib22___Win32_Release/"\r
++                              ProgramDataBaseFileName=".\mod_shib22___Win32_Release/"\r
++                              WarningLevel="3"\r
++                              SuppressStartupBanner="true"\r
++                              Detect64BitPortabilityProblems="true"\r
++                      />\r
++                      <Tool\r
++                              Name="VCManagedResourceCompilerTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCResourceCompilerTool"\r
++                              PreprocessorDefinitions="NDEBUG"\r
++                              Culture="1033"\r
++                      />\r
++                      <Tool\r
++                              Name="VCPreLinkEventTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCLinkerTool"\r
++                              AdditionalDependencies="log4cpp.lib xerces-c_2.lib saml_5.lib libapr-1.lib libhttpd.lib"\r
++                              OutputFile="mod_shib22___Win32_Release/mod_shib_22.so"\r
++                              LinkIncremental="1"\r
++                              SuppressStartupBanner="true"\r
++                              AdditionalLibraryDirectories="../../../opensaml/c/saml/Release,\Apache22\lib"\r
++                              ProgramDatabaseFile=".\mod_shib22___Win32_Release/mod_shib_22.pdb"\r
++                              ImportLibrary=".\mod_shib22___Win32_Release/mod_shib_22.lib"\r
++                              TargetMachine="1"\r
++                      />\r
++                      <Tool\r
++                              Name="VCALinkTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCManifestTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCXDCMakeTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCBscMakeTool"\r
++                              SuppressStartupBanner="true"\r
++                              OutputFile=".\mod_shib22___Win32_Release/mod_shib22.bsc"\r
++                      />\r
++                      <Tool\r
++                              Name="VCFxCopTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCAppVerifierTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCWebDeploymentTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCPostBuildEventTool"\r
++                      />\r
++              </Configuration>\r
++              <Configuration\r
++                      Name="Debug|Win32"\r
++                      OutputDirectory=".\mod_shib22___Win32_Debug"\r
++                      IntermediateDirectory=".\mod_shib22___Win32_Debug"\r
++                      ConfigurationType="2"\r
++                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
++                      UseOfMFC="0"\r
++                      ATLMinimizesCRunTimeLibraryUsage="false"\r
++                      CharacterSet="2"\r
++                      >\r
++                      <Tool\r
++                              Name="VCPreBuildEventTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCCustomBuildTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCXMLDataGeneratorTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCWebServiceProxyGeneratorTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCMIDLTool"\r
++                              PreprocessorDefinitions="_DEBUG"\r
++                              MkTypLibCompatible="true"\r
++                              SuppressStartupBanner="true"\r
++                              TargetEnvironment="1"\r
++                              TypeLibraryName=".\mod_shib22___Win32_Debug/mod_shib22.tlb"\r
++                              HeaderFileName=""\r
++                      />\r
++                      <Tool\r
++                              Name="VCCLCompilerTool"\r
++                              Optimization="0"\r
++                              AdditionalIncludeDirectories="..,..\..\cpp-opensaml1,\Apache22D\include"\r
++                              PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"\r
++                              MinimalRebuild="true"\r
++                              BasicRuntimeChecks="3"\r
++                              RuntimeLibrary="3"\r
++                              RuntimeTypeInfo="true"\r
++                              PrecompiledHeaderFile=".\mod_shib22___Win32_Debug/mod_shib22.pch"\r
++                              AssemblerListingLocation=".\mod_shib22___Win32_Debug/"\r
++                              ObjectFile=".\mod_shib22___Win32_Debug/"\r
++                              ProgramDataBaseFileName=".\mod_shib22___Win32_Debug/"\r
++                              BrowseInformation="1"\r
++                              WarningLevel="3"\r
++                              SuppressStartupBanner="true"\r
++                              Detect64BitPortabilityProblems="true"\r
++                              DebugInformationFormat="4"\r
++                      />\r
++                      <Tool\r
++                              Name="VCManagedResourceCompilerTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCResourceCompilerTool"\r
++                              PreprocessorDefinitions="_DEBUG"\r
++                              Culture="1033"\r
++                      />\r
++                      <Tool\r
++                              Name="VCPreLinkEventTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCLinkerTool"\r
++                              AdditionalDependencies="log4cppD.lib xerces-c_2D.lib saml_5D.lib libapr-1.lib libhttpd.lib"\r
++                              OutputFile="mod_shib22___Win32_Debug/mod_shib_22.so"\r
++                              LinkIncremental="2"\r
++                              SuppressStartupBanner="true"\r
++                              AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\Apache22D\lib"\r
++                              GenerateDebugInformation="true"\r
++                              ProgramDatabaseFile=".\mod_shib22___Win32_Debug/mod_shib_22.pdb"\r
++                              ImportLibrary=".\mod_shib22___Win32_Debug/mod_shib_22.lib"\r
++                              TargetMachine="1"\r
++                      />\r
++                      <Tool\r
++                              Name="VCALinkTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCManifestTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCXDCMakeTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCBscMakeTool"\r
++                              SuppressStartupBanner="true"\r
++                              OutputFile=".\mod_shib22___Win32_Debug/mod_shib22.bsc"\r
++                      />\r
++                      <Tool\r
++                              Name="VCFxCopTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCAppVerifierTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCWebDeploymentTool"\r
++                      />\r
++                      <Tool\r
++                              Name="VCPostBuildEventTool"\r
++                      />\r
++              </Configuration>\r
++      </Configurations>\r
++      <References>\r
++      </References>\r
++      <Files>\r
++              <File\r
++                      RelativePath="mod_shib_22.cpp"\r
++                      >\r
++                      <FileConfiguration\r
++                              Name="Release|Win32"\r
++                              >\r
++                              <Tool\r
++                                      Name="VCCLCompilerTool"\r
++                                      AdditionalIncludeDirectories=""\r
++                                      PreprocessorDefinitions=""\r
++                              />\r
++                      </FileConfiguration>\r
++                      <FileConfiguration\r
++                              Name="Debug|Win32"\r
++                              >\r
++                              <Tool\r
++                                      Name="VCCLCompilerTool"\r
++                                      AdditionalIncludeDirectories=""\r
++                                      PreprocessorDefinitions=""\r
++                              />\r
++                      </FileConfiguration>\r
++              </File>\r
++              <File\r
++                      RelativePath="mod_shib_22.rc"\r
++                      >\r
++                      <FileConfiguration\r
++                              Name="Release|Win32"\r
++                              >\r
++                              <Tool\r
++                                      Name="VCResourceCompilerTool"\r
++                                      PreprocessorDefinitions=""\r
++                              />\r
++                      </FileConfiguration>\r
++                      <FileConfiguration\r
++                              Name="Debug|Win32"\r
++                              >\r
++                              <Tool\r
++                                      Name="VCResourceCompilerTool"\r
++                                      PreprocessorDefinitions=""\r
++                              />\r
++                      </FileConfiguration>\r
++              </File>\r
++              <File\r
++                      RelativePath="resource.h"\r
++                      >\r
++              </File>\r
++      </Files>\r
++      <Globals>\r
++      </Globals>\r
++</VisualStudioProject>\r