Renamed setHeader to avoid collision.

diff --git a/saml/binding/HTTPResponse.h b/saml/binding/HTTPResponse.h
index b4af8f5..b94e641 100644 (file)
--- a/saml/binding/HTTPResponse.h
+++ b/saml/binding/HTTPResponse.h
@@ -49,7 +49,7 @@ namespace opensaml {
          * @param name  header name
          * @param value value to set, or NULL to clear
          */
-        virtual void setHeader(const char* name, const char* value)=0;
+        virtual void setResponseHeader(const char* name, const char* value)=0;
 
         /**
          * Sets a client cookie.

diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
index 850a077..847513a 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
@@ -72,8 +72,8 @@ long SAML1SOAPEncoder::encode(
     genericResponse.setContentType("text/xml");
     HTTPResponse* httpResponse = dynamic_cast<HTTPResponse*>(&genericResponse);
     if (httpResponse) {
-        httpResponse->setHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
-        httpResponse->setHeader("Pragma", "no-cache");
+        httpResponse->setResponseHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
+        httpResponse->setResponseHeader("Pragma", "no-cache");
     }
 
     DOMElement* rootElement = NULL;

diff --git a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
index 7c407d9..5f519d8 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
@@ -72,8 +72,8 @@ long SAML2SOAPEncoder::encode(
     genericResponse.setContentType("text/xml");
     HTTPResponse* httpResponse = dynamic_cast<HTTPResponse*>(&genericResponse);
     if (httpResponse) {
-        httpResponse->setHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
-        httpResponse->setHeader("Pragma", "no-cache");
+        httpResponse->setResponseHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
+        httpResponse->setResponseHeader("Pragma", "no-cache");
     }
 
     DOMElement* rootElement = NULL;

diff --git a/samltest/binding.h b/samltest/binding.h
index a1c6d19..d4de9c9 100644 (file)
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -190,12 +190,12 @@ public:
     \r
     // HTTPResponse methods\r
     \r
-    void setHeader(const char* name, const char* value) {\r
+    void setResponseHeader(const char* name, const char* value) {\r
         m_headers[name] = value ? value : "";\r
     }\r
 \r
     void setContentType(const char* type) {\r
-        setHeader("Content-Type", type);\r
+        setResponseHeader("Content-Type", type);\r
     }\r
     \r
     void setCookie(const char* name, const char* value) {\r
@@ -256,14 +256,6 @@ public:
         return decoded;\r
     }\r
     \r
-    long sendResponse(std::istream& inputStream) {\r
-        return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_OK);\r
-    }\r
-\r
-    long sendError(std::istream& inputStream) {\r
-        return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_ERROR);\r
-    }\r
-\r
     long sendResponse(std::istream& inputStream, long status) {\r
         m_method="POST";\r
         string page,line;\r