--- parser3/src/classes/curl.C	2016/07/29 20:24:16	1.40
+++ parser3/src/classes/curl.C	2016/10/25 23:37:52	1.45
@@ -17,7 +17,7 @@
 #include "pa_http.h" 
 #include "ltdl.h"
 
-volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.40 2016/07/29 20:24:16 moko Exp $";
+volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.45 2016/10/25 23:37:52 moko Exp $";
 
 class MCurl: public Methoded {
 public:
@@ -127,17 +127,15 @@ public:
 };
 
 bool curl_linked = false;
-const char *curl_library="libcurl" LT_MODULE_EXT;
-
 const char *curl_status = 0;
+const char *curl_library="libcurl" LT_MODULE_EXT;
 
 static void temp_curl(void (*action)(Request&, MethodParams&), Request& r, MethodParams& params){
-	if(!curl_linked){
-		curl_linked=true;
+	if(!curl_linked)
 		curl_status=dlink(curl_library);
-	}
 
 	if(curl_status == 0){
+		curl_linked=true;
 		Temp_curl temp_curl;
 		action(r,params);
 	} else {
@@ -278,6 +276,7 @@ public:
 		CURL_OPT(CURL_INT, SSL_VERIFYHOST);
 		CURL_OPT(CURL_STRING, SSL_CIPHER_LIST);
 		CURL_OPT(CURL_INT, SSL_SESSIONID_CACHE);
+		CURL_OPT(CURL_INT, SSLVERSION);
 
 		PARSER_OPT(PARSER_LIBRARY, "library");
 		PARSER_OPT(PARSER_NAME, "name");
@@ -411,7 +410,7 @@ static void curl_setopt(HashStringValue:
 		throw Exception("curl", 0, "called with invalid option '%s'", key.cstr());
 
 	CURLcode res = CURLE_OK;
-	Value &v=r.process_to_value(*value);
+	Value &v=r.process(*value);
 
 	switch (opt->type){
 		case CurlOption::CURL_STRING:{
@@ -491,7 +490,7 @@ static void curl_setopt(HashStringValue:
 		}
 		case CurlOption::PARSER_LIBRARY:{
 			// 'library' parser option
-			if(fcurl==0){
+			if(!curl_linked){
 				curl_library=v.as_string().taint_cstr(String::L_FILE_SPEC);
 			} else 
 				throw Exception("curl", 0, "failed to set option '%s': already loaded", key.cstr());
@@ -518,7 +517,7 @@ static void curl_setopt(HashStringValue:
 		}
 		case CurlOption::PARSER_RESPONSE_CHARSET:{
 			// 'response-charset' parser option
-			options().response_charset=&::charsets.get(v.as_string());
+			options().response_charset=&pa_charsets.get(v.as_string());
 			break;
 		}
 	}
@@ -534,8 +533,8 @@ static void _curl_options(Request& r, Me
 	if(HashStringValue* options_hash=params.as_hash(0)){
 		if(Value* value=options_hash->get("charset")){
 			// charset should be handled first as params may require transcode
-			Value &v=r.process_to_value(*value);
-			options().charset=&::charsets.get(v.as_string());
+			Value &v=r.process(*value);
+			options().charset=&pa_charsets.get(v.as_string());
 		}
 		options_hash->for_each<Request&>(curl_setopt, r);
 	}
@@ -576,7 +575,7 @@ static void _curl_info(Request& r, Metho
 		curl_infos=new CurlInfoHash();
 	if(params.count()==1){
 		const String &name=params.as_string(0, "name must be string");
-		r.write_assign_lang(*curl_getinfo(name));
+		r.write_pass_lang(*curl_getinfo(name));
 	} else {
 		VHash& result=*new VHash;
 		for(CurlInfoHash::Iterator i(*curl_infos); i; i.next() ){
@@ -675,7 +674,7 @@ static void _curl_load_action(Request& r
 		asked_charset=detect_charset(response.content_type.cstr());
 
 	if(options().is_text)
-		asked_charset=charsets.checkBOM(body.buf, body.length, asked_charset);
+		asked_charset=pa_charsets.checkBOM(body.buf, body.length, asked_charset);
 
 	if (!asked_charset)
 		asked_charset = options().charset;