Merge commit '1e3ed01c149aaeed5a64aacff218a5486128fc92' into devel/openid20

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/curl.cc b/lib/curl.cc
index 6172828..734e2ca 100644
--- a/lib/curl.cc
+++ b/lib/curl.cc
@@ -1,32 +1,52 @@
+#include <opkele/exception.h>
 #include <opkele/curl.h>
 
 #include "config.h"
 
 namespace opkele {
 
     namespace util {
 
+	curl_slist_t::~curl_slist_t() throw() {
+	    if(_s)
+		curl_slist_free_all(_s);
+	}
+
+	curl_slist_t& curl_slist_t::operator=(curl_slist *s) {
+	    if(_s)
+		curl_slist_free_all(_s);
+	    _s = s;
+	    return *this;
+	}
+
+	void curl_slist_t::append(const char *str) {
+	    curl_slist *s = curl_slist_append(_s,str);
+	    if(!s)
+		throw opkele::exception(OPKELE_CP_ "failed to curl_slist_append()");
+	    _s=s;
+	}
+
 	curl_t::~curl_t() throw() {
 	    if(_c)
 		curl_easy_cleanup(_c);
 	}
 
 	curl_t& curl_t::operator=(CURL *c) {
 	    if(_c)
 		curl_easy_cleanup(_c);
 	    _c = c;
 	    return *this;
 	}
 
 	CURLcode curl_t::misc_sets() {
 	    assert(_c);
 	    CURLcode r;
 	    (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1))
 	    || (r=easy_setopt(CURLOPT_MAXREDIRS,5))
 	    || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120))
 	    || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1))
 	    || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
 	    || (r=easy_setopt(CURLOPT_TIMEOUT,20))
 #ifdef	DISABLE_CURL_SSL_VERIFYHOST
 	    || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0))
 #endif