Convert LLCore::HttpHeaders to use shared_ptr<> rather than an intrusive_ptr<> for refrence counting.

1 files changed, 12 insertions, 11 deletions

diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
index b1bb101bea..0465c2b83f 100755
--- a/indra/llcorehttp/_httpoprequest.h
+++ b/indra/llcorehttp/_httpoprequest.h
@@ -41,6 +41,7 @@
 #include "_httpoperation.h"
 #include "_refcounted.h"
 
+#include "httpheaders.h"
 
 namespace LLCore
 {
@@ -105,7 +106,7 @@ public:
 						HttpRequest::priority_t priority,
 						const std::string & url,
 						HttpOptions * options,
-						HttpHeaders * headers);
+						HttpHeaders::ptr_t & headers);
 	
 	HttpStatus setupGetByteRange(HttpRequest::policy_t policy_id,
 								 HttpRequest::priority_t priority,
@@ -113,40 +114,40 @@ public:
 								 size_t offset,
 								 size_t len,
 								 HttpOptions * options,
-								 HttpHeaders * headers);
+								 HttpHeaders::ptr_t & headers);
 	
 	HttpStatus setupPost(HttpRequest::policy_t policy_id,
 						 HttpRequest::priority_t priority,
 						 const std::string & url,
 						 BufferArray * body,
 						 HttpOptions * options,
-						 HttpHeaders * headers);
+						 HttpHeaders::ptr_t & headers);
 	
 	HttpStatus setupPut(HttpRequest::policy_t policy_id,
 						HttpRequest::priority_t priority,
 						const std::string & url,
 						BufferArray * body,
 						HttpOptions * options,
-						HttpHeaders * headers);
+						HttpHeaders::ptr_t & headers);
 
     HttpStatus setupDelete(HttpRequest::policy_t policy_id,
                         HttpRequest::priority_t priority,
                         const std::string & url,
                         HttpOptions * options,
-                        HttpHeaders * headers);
+                        HttpHeaders::ptr_t & headers);
 
     HttpStatus setupPatch(HttpRequest::policy_t policy_id,
                         HttpRequest::priority_t priority,
                         const std::string & url,
                         BufferArray * body,
                         HttpOptions * options,
-                        HttpHeaders * headers);
+                        HttpHeaders::ptr_t & headers);
 
     HttpStatus setupCopy(HttpRequest::policy_t policy_id,
                         HttpRequest::priority_t priority,
                         const std::string & url,
                         HttpOptions * options,
-                        HttpHeaders * headers);
+                        HttpHeaders::ptr_t & headers);
 
     // Internal method used to setup the libcurl options for a request.
 	// Does all the libcurl handle setup in one place.
@@ -167,7 +168,7 @@ protected:
 					 const std::string & url,
 					 BufferArray * body,
 					 HttpOptions * options,
-					 HttpHeaders * headers);
+					 HttpHeaders::ptr_t &headers);
 
 	// libcurl operational callbacks
 	//
@@ -197,7 +198,7 @@ public:
 	BufferArray *		mReqBody;
 	off_t				mReqOffset;
 	size_t				mReqLength;
-	HttpHeaders *		mReqHeaders;
+	HttpHeaders::ptr_t	mReqHeaders;
 	HttpOptions *		mReqOptions;
 
 	// Transport data
@@ -215,7 +216,7 @@ public:
 	off_t				mReplyOffset;
 	size_t				mReplyLength;
 	size_t				mReplyFullLength;
-	HttpHeaders *		mReplyHeaders;
+	HttpHeaders::ptr_t	mReplyHeaders;
 	std::string			mReplyConType;
 	int					mReplyRetryAfter;
 
@@ -246,7 +247,7 @@ public:
 
 // Internal function to append the contents of an HttpHeaders
 // instance to a curl_slist object.
-curl_slist * append_headers_to_slist(const HttpHeaders *, curl_slist * slist);
+curl_slist * append_headers_to_slist(const HttpHeaders::ptr_t &, curl_slist * slist);
 
 }   // end namespace LLCore