X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2FSPRequest.h;h=97fadc67b7a88dae9c0451bfd1208623f8acb4d7;hb=HEAD;hp=9ea140a8a590f87eaaaef356776c142a5d0e1929;hpb=b295ba2e5fc8667d0318cfa78d65096cd44afbd9;p=shibboleth%2Fsp.git

diff --git a/shibsp/SPRequest.h b/shibsp/SPRequest.h
index 9ea140a..97fadc6 100644
--- a/shibsp/SPRequest.h
+++ b/shibsp/SPRequest.h
@@ -24,8 +24,8 @@
 #define __shibsp_req_h__
 
 #include <shibsp/RequestMapper.h>
-#include <saml/binding/HTTPRequest.h>
-#include <saml/binding/HTTPResponse.h>
+#include <xmltooling/io/HTTPRequest.h>
+#include <xmltooling/io/HTTPResponse.h>
 
 namespace shibsp {
     
@@ -42,7 +42,7 @@ namespace shibsp {
      * 
      * <p>This interface need not be threadsafe.
      */
-    class SHIBSP_API SPRequest : public virtual opensaml::HTTPRequest, public virtual opensaml::HTTPResponse
+    class SHIBSP_API SPRequest : public virtual xmltooling::HTTPRequest, public virtual xmltooling::HTTPResponse
     {
     protected:
         SPRequest() {}
@@ -73,10 +73,13 @@ namespace shibsp {
 
         /**
          * Returns a locked Session associated with the request.
-         * 
+         *
+         * @param checkTimeout  true iff the last-used timestamp should be updated and any timeout policy enforced
+         * @param ignoreAddress true iff all address checking should be ignored, regardless of policy
+         * @param cache         true iff the request should hold the Session lock itself and unlock during cleanup
          * @return pointer to Session, or NULL
          */
-        virtual const Session* getSession() const=0;
+        virtual Session* getSession(bool checkTimeout=true, bool ignoreAddress=false, bool cache=true) const=0;
 
         /**
          * Returns the effective base Handler URL for a resource,
@@ -88,14 +91,6 @@ namespace shibsp {
         virtual const char* getHandlerURL(const char* resource=NULL) const=0;
 
         /**
-         * Get a cookie value supplied by the client.
-         * 
-         * @param name  name of cookie
-         * @return  cookie value or NULL
-         */
-        virtual const char* getCookie(const char* name) const=0;
-        
-        /**
          * Returns a non-spoofable request header value, if possible.
          * Platforms that support environment export can redirect header
          * lookups by overriding this method.
@@ -110,9 +105,10 @@ namespace shibsp {
         /**
          * Ensures no value exists for a request header.
          * 
-         * @param name  name of header to clear 
+         * @param rawname  raw name of header to clear
+         * @param cginame  CGI-equivalent name of header
          */
-        virtual void clearHeader(const char* name)=0;
+        virtual void clearHeader(const char* rawname, const char* cginame)=0;
 
         /**
          * Sets a value for a request header.