[SCM] Debian packaging for XMLTooling-C branch, master, updated. upstream/1.0-71-g792adea

[Russ Allbery]

The following commit has been merged in the master branch:
commit 571b623ef6f85257a694da1f9242ea8533ed0691
Merge: 5ff39e90a0fb4be83622b0787a135b608a96973d d536883cfa5a12c5cfa665fc7899e4f8da10a8d4
Author: Russ Allbery <rra at debian.org>
Date:   Sat Aug 23 17:45:42 2008 -0700

    Merge branch 'upstream' into bug/gcc-4.3
    
    Conflicts:
    
    	xmltooling/XMLObjectBuilder.h
    	xmltooling/base.h
    	xmltooling/exceptions.cpp
    	xmltooling/impl/MemoryStorageService.cpp

diff --combined xmltooling/security/impl/InlineKeyResolver.cpp
index 57678c0,6b71a9a..bcc49ef
--- a/xmltooling/security/impl/InlineKeyResolver.cpp
+++ b/xmltooling/security/impl/InlineKeyResolver.cpp
@@@ -32,7 -32,6 +32,7 @@@
  #include "util/XMLConstants.h"
  #include "validation/ValidatorSuite.h"
  
 +#include <memory>
  #include <xercesc/util/XMLUniDefs.hpp>
  #include <xsec/dsig/DSIGKeyInfoX509.hpp>
  #include <xsec/enc/XSECKeyInfoResolverDefault.hpp>
@@@ -173,6 -172,8 +173,8 @@@ void InlineCredential::resolve(const Ke
              // If we have a cert, just use it.
              if (!m_xseccerts.empty())
                  m_key = m_xseccerts.front()->clonePublicKey();
+             else
+                 resolveKey(keyInfo);
          }
          // Otherwise try directly for a key and then go for certs if none is found.
          else if (!resolveKey(keyInfo) && resolveCerts(keyInfo)) {
diff --combined xmltooling/soap/impl/SOAPClient.cpp
index 0addc31,e89742b..f7ae96b
--- a/xmltooling/soap/impl/SOAPClient.cpp
+++ b/xmltooling/soap/impl/SOAPClient.cpp
@@@ -28,7 -28,6 +28,7 @@@
  #include "util/XMLHelper.h"
  #include "validation/ValidatorSuite.h"
  
 +#include <memory>
  #include <sstream>
  
  using namespace soap11;
@@@ -90,8 -89,15 +90,15 @@@ Envelope* SOAPClient::receive(
      XercesJanitor<DOMDocument> janitor(doc);
  
      Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient");
-     if (log.isDebugEnabled())
+     if (log.isDebugEnabled()) {
+ #ifdef XMLTOOLING_LOG4SHIB
          log.debugStream() << "received XML:\n" << *(doc->getDocumentElement()) << logging::eol;
+ #else
+         string buf;
+         XMLHelper::serialize(doc->getDocumentElement(), buf);
+         log.debugStream() << "received XML:\n" << buf << logging::eol;
+ #endif
+     }
      
      auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
      janitor.release();

-- 
Debian packaging for XMLTooling-C