--- parser3/src/classes/curl.C	2016/07/27 22:34:49	1.39
+++ parser3/src/classes/curl.C	2016/08/03 20:35:36	1.41
@@ -17,7 +17,7 @@
 #include "pa_http.h" 
 #include "ltdl.h"
 
-volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.39 2016/07/27 22:34:49 moko Exp $";
+volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.41 2016/08/03 20:35:36 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 {
@@ -491,7 +489,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 +516,7 @@ static void curl_setopt(HashStringValue:
 		}
 		case CurlOption::PARSER_RESPONSE_CHARSET:{
 			// 'response-charset' parser option
-			options().response_charset=&::charsets.get(v.as_string().change_case(r.charsets.source(), String::CC_UPPER));
+			options().response_charset=&::charsets.get(v.as_string());
 			break;
 		}
 	}
@@ -535,7 +533,7 @@ static void _curl_options(Request& r, Me
 		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().change_case(r.charsets.source(), String::CC_UPPER));
+			options().charset=&::charsets.get(v.as_string());
 		}
 		options_hash->for_each<Request&>(curl_setopt, r);
 	}