From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Thu, 19 May 2011 22:17:47 +0000 (+0000)
Subject: Additional fix for SSPCPP-344.
X-Git-Tag: moonshot-old~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=25136ca017dfd76b366a50938309009ebef4f647

Additional fix for SSPCPP-344.


git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3430 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index 3ef824e..95474f5 100644
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -1,11 +1,12 @@
 /*
- *  Copyright 2001-2010 Internet2
+ * Licensed to UCAID under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may not use this
+ * file except in compliance with the License.  You may obtain a copy of the
+ * License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -308,10 +309,10 @@ pair<bool,long> StatusHandler::run(SPRequest& request, bool isHandler) const
         stringstream msg;
         msg << "<StatusHandler time='" << timestamp.get() << "'>";
             msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
-                << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+                << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
 #ifndef SHIBSP_LITE
                 << "' XML-Security-C='" << XSEC_FULLVERSIONDOT
-                << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+                << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
 #endif
                 << "' Shibboleth='" << PACKAGE_VERSION << "'/>";
             systemInfo(msg) << "<RequestSettings";
@@ -345,10 +346,10 @@ pair<bool,long> StatusHandler::run(SPRequest& request, bool isHandler) const
         stringstream msg;
         msg << "<StatusHandler time='" << timestamp.get() << "'>";
             msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
-                << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+                << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
 #ifndef SHIBSP_LITE
                 << "' XML-Security-C='" << XSEC_FULLVERSIONDOT
-                << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+                << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
 #endif
                 << "' Shibboleth='" << PACKAGE_VERSION << "'/>";
             systemInfo(msg) << "<Status><Exception type='" << ex.getClassName() << "'>" << ex.what() << "</Exception></Status>";
@@ -364,10 +365,10 @@ pair<bool,long> StatusHandler::run(SPRequest& request, bool isHandler) const
         stringstream msg;
         msg << "<StatusHandler time='" << timestamp.get() << "'>";
             msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
-                << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+                << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
 #ifndef SHIBSP_LITE
                 << "' XML-Security-C='" << XSEC_FULLVERSIONDOT
-                << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+                << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
 #endif
                 << "' Shibboleth='" << PACKAGE_VERSION << "'/>";
             systemInfo(msg) << "<Status><Exception type='std::exception'>" << ex.what() << "</Exception></Status>";
@@ -416,9 +417,9 @@ pair<bool,long> StatusHandler::processMessage(
     const char* status = "<OK/>";
 
     s << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
-        << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+        << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
         << "' XML-Security-C='" << XSEC_FULLVERSIONDOT
-        << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+        << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
         << "' Shibboleth='" << PACKAGE_VERSION << "'/>";
 
     systemInfo(s);