From 93f27cbab489efed65b89371b6cf13ae6fb8e2f3 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 12 Jan 2007 05:48:43 +0000 Subject: [PATCH] Renamed setHeader to avoid collision. --- saml/binding/HTTPResponse.h | 2 +- saml/saml1/binding/impl/SAML1SOAPEncoder.cpp | 4 ++-- saml/saml2/binding/impl/SAML2SOAPEncoder.cpp | 4 ++-- samltest/binding.h | 12 ++---------- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/saml/binding/HTTPResponse.h b/saml/binding/HTTPResponse.h index b4af8f5..b94e641 100644 --- 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 --- 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(&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 --- 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(&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 --- a/samltest/binding.h +++ b/samltest/binding.h @@ -190,12 +190,12 @@ public: // HTTPResponse methods - void setHeader(const char* name, const char* value) { + void setResponseHeader(const char* name, const char* value) { m_headers[name] = value ? value : ""; } void setContentType(const char* type) { - setHeader("Content-Type", type); + setResponseHeader("Content-Type", type); } void setCookie(const char* name, const char* value) { @@ -256,14 +256,6 @@ public: return decoded; } - long sendResponse(std::istream& inputStream) { - return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_OK); - } - - long sendError(std::istream& inputStream) { - return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_ERROR); - } - long sendResponse(std::istream& inputStream, long status) { m_method="POST"; string page,line; -- 2.1.4