Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / saml / saml1 / binding / impl / SAML1SOAPEncoder.cpp

diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
index bb9f984..b41f196 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 /**
  * SAML1SOAPEncoder.cpp
  * 
- * SAML 1.x SOAP binding message encoder
+ * SAML 1.x SOAP binding message encoder.
  */
 
 #include "internal.h"
@@ -29,6 +29,7 @@
 #include <sstream>
 #include <xmltooling/logging.h>
 #include <xmltooling/io/HTTPResponse.h>
+#include <xmltooling/signature/Signature.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/soap/SOAP.h>
 
@@ -57,12 +58,12 @@ namespace opensaml {
                 GenericResponse& genericResponse,
                 XMLObject* xmlObject,
                 const char* destination,
-                const EntityDescriptor* recipient=NULL,
-                const char* relayState=NULL,
-                const ArtifactGenerator* artifactGenerator=NULL,
-                const Credential* credential=NULL,
-                const XMLCh* signatureAlg=NULL,
-                const XMLCh* digestAlg=NULL
+                const EntityDescriptor* recipient=nullptr,
+                const char* relayState=nullptr,
+                const ArtifactGenerator* artifactGenerator=nullptr,
+                const Credential* credential=nullptr,
+                const XMLCh* signatureAlg=nullptr,
+                const XMLCh* digestAlg=nullptr
                 ) const;
         };
 
@@ -97,12 +98,13 @@ long SAML1SOAPEncoder::encode(
     genericResponse.setContentType("text/xml");
     HTTPResponse* httpResponse = dynamic_cast<HTTPResponse*>(&genericResponse);
     if (httpResponse) {
+        httpResponse->setResponseHeader("Expires", "01-Jan-1997 12:00:00 GMT");
         httpResponse->setResponseHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
         httpResponse->setResponseHeader("Pragma", "no-cache");
     }
 
     bool detachOnFailure = false;
-    DOMElement* rootElement = NULL;
+    DOMElement* rootElement = nullptr;
     
     // Check for a naked Response.
     Response* response = dynamic_cast<Response*>(xmlObject);
@@ -121,7 +123,7 @@ long SAML1SOAPEncoder::encode(
     if (env) {
         if (!response) {
             response = (env->getBody() && env->getBody()->hasChildren()) ?
-                dynamic_cast<Response*>(env->getBody()->getUnknownXMLObjects().front()) : NULL;
+                dynamic_cast<Response*>(env->getBody()->getUnknownXMLObjects().front()) : nullptr;
         }
         try {
             // Now check for signing requirements.
@@ -146,7 +148,7 @@ long SAML1SOAPEncoder::encode(
             
                     // Sign message while marshalling.
                     vector<Signature*> sigs(1,sig);
-                    rootElement = env->marshall((DOMDocument*)NULL,&sigs,credential);
+                    rootElement = env->marshall((DOMDocument*)nullptr,&sigs,credential);
                 }
             }
             else {
@@ -158,7 +160,7 @@ long SAML1SOAPEncoder::encode(
             s << *rootElement;
             
             if (log.isDebugEnabled())
-                log.debug("marshalled envelope: %s", s.str().c_str());
+                log.debug("marshalled envelope:\n%s", s.str().c_str());
             
             log.debug("sending serialized envelope");
             bool error = (!response && env->getBody() && env->getBody()->hasChildren() &&
@@ -196,7 +198,7 @@ long SAML1SOAPEncoder::encode(
             s << *rootElement;
             
             if (log.isDebugEnabled())
-                log.debug("marshalled envelope: %s", s.str().c_str());
+                log.debug("marshalled envelope:\n%s", s.str().c_str());
             
             log.debug("sending serialized envelope");
             long ret = genericResponse.sendError(s);