[cpp-sp COMMIT] in /branches/REL_2: configure.ac shibsp/AbstractSPRequest.cpp shibsp/AbstractSPRequest.h shibsp/Appli...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 10 20:53:27 2012
New Revision: 3554

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3554&view=rev
Log:
Boost code changes

Modified:
    branches/REL_2/configure.ac
    branches/REL_2/shibsp/AbstractSPRequest.cpp
    branches/REL_2/shibsp/AbstractSPRequest.h
    branches/REL_2/shibsp/Application.cpp
    branches/REL_2/shibsp/SPConfig.cpp
    branches/REL_2/shibsp/ServiceProvider.cpp
    branches/REL_2/shibsp/attribute/KeyInfoAttributeDecoder.cpp
    branches/REL_2/shibsp/attribute/NameIDAttributeDecoder.cpp
    branches/REL_2/shibsp/attribute/StringAttributeDecoder.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
    branches/REL_2/shibsp/binding/impl/XMLProtocolProvider.cpp
    branches/REL_2/shibsp/impl/ChainingAccessControl.cpp
    branches/REL_2/shibsp/impl/StorageServiceSessionCache.cpp
    branches/REL_2/shibsp/impl/XMLAccessControl.cpp
    branches/REL_2/shibsp/impl/XMLRequestMapper.cpp
    branches/REL_2/shibsp/impl/XMLSecurityPolicyProvider.cpp
    branches/REL_2/shibsp/impl/XMLServiceProvider.cpp
    branches/REL_2/shibsp/metadata/DynamicMetadataProvider.cpp
    branches/REL_2/shibsp/metadata/MetadataExtImpl.cpp
    branches/REL_2/shibsp/remoting/ddf.h
    branches/REL_2/shibsp/remoting/impl/SocketListener.cpp
    branches/REL_2/shibsp/remoting/impl/SocketListener.h
    branches/REL_2/shibsp/remoting/impl/TCPListener.cpp
    branches/REL_2/shibsp/remoting/impl/ddf.cpp
    branches/REL_2/shibsp/security/PKIXTrustEngine.cpp
    branches/REL_2/shibsp/util/CGIParser.cpp
    branches/REL_2/shibsp/util/DOMPropertySet.cpp
    branches/REL_2/shibsp/util/DOMPropertySet.h
    branches/REL_2/shibsp/util/TemplateParameters.cpp

Modified: branches/REL_2/configure.ac
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configure.ac?rev=3554&r1=3553&r2=3554&view=diff
==============================================================================
--- branches/REL_2/configure.ac (original)
+++ branches/REL_2/configure.ac Tue Jan 10 20:53:27 2012
@@ -126,7 +126,9 @@
 BOOST_BIND
 BOOST_LAMBDA
 BOOST_PTR_CONTAINER
+BOOST_SMART_PTR
 BOOST_STRING_ALGO
+BOOST_TUPLE
 CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 
 # Thank you Solaris, really.

Modified: branches/REL_2/shibsp/AbstractSPRequest.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/AbstractSPRequest.cpp?rev=3554&r1=3553&r2=3554&view=diff
==============================================================================
--- branches/REL_2/shibsp/AbstractSPRequest.cpp (original)
+++ branches/REL_2/shibsp/AbstractSPRequest.cpp Tue Jan 10 20:53:27 2012
@@ -33,6 +33,8 @@
 #include "SessionCache.h"
 #include "util/CGIParser.h"
 
+#include <boost/lexical_cast.hpp>
+
 using namespace shibsp;
 using namespace opensaml;
 using namespace xmltooling;
@@ -66,10 +68,10 @@
 #endif
 
 AbstractSPRequest::AbstractSPRequest(const char* category)
-    : m_sp(nullptr), m_mapper(nullptr), m_app(nullptr), m_sessionTried(false), m_session(nullptr),
-        m_log(&Category::getInstance(category)), m_parser(nullptr)
-{
-    m_sp=SPConfig::getConfig().getServiceProvider();
+    : m_sp(SPConfig::getConfig().getServiceProvider()),
+        m_mapper(nullptr), m_app(nullptr), m_sessionTried(false), m_session(nullptr),
+        m_log(&Category::getInstance(category))
+{
     m_sp->lock();
 }
 
@@ -81,7 +83,6 @@
         m_mapper->unlock();
     if (m_sp)
         m_sp->unlock();
-    delete m_parser;
 }
 
 const ServiceProvider& AbstractSPRequest::getServiceProvider() const
@@ -93,7 +94,7 @@
 {
     if (!m_mapper) {
         // Map request to application and content settings.
-        m_mapper=m_sp->getRequestMapper();
+        m_mapper = m_sp->getRequestMapper();
         m_mapper->lock();
         m_settings = m_mapper->getSettings(*this);
 
@@ -110,7 +111,7 @@
 {
     if (!m_app) {
         // Now find the application from the URL settings
-        m_app=m_sp->getApplication(getRequestSettings().first->getString("applicationId").second);
+        m_app = m_sp->getApplication(getRequestSettings().first->getString("applicationId").second);
         if (!m_app)
             throw ConfigurationException("Unable to map non-default applicationId to an ApplicationOverride, check configuration.");
     }
@@ -126,16 +127,16 @@
         m_sessionTried = true;
 
     // Need address checking and timeout settings.
-    time_t timeout=3600;
+    time_t timeout = 3600;
     if (checkTimeout || !ignoreAddress) {
-        const PropertySet* props=getApplication().getPropertySet("Sessions");
+        const PropertySet* props = getApplication().getPropertySet("Sessions");
         if (props) {
             if (checkTimeout) {
-                pair<bool,unsigned int> p=props->getUnsignedInt("timeout");
+                pair<bool,unsigned int> p = props->getUnsignedInt("timeout");
                 if (p.first)
                     timeout = p.second;
             }
-            pair<bool,bool> pcheck=props->getBool("consistentAddress");
+            pair<bool,bool> pcheck = props->getBool("consistentAddress");
             if (pcheck.first)

[... 6092 lines stripped ...]