--- parser3/src/classes/curl.C	2010/10/21 15:06:27	1.7
+++ parser3/src/classes/curl.C	2010/11/24 00:20:47	1.9
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_CURL
 
-static const char * const IDENT_INET_C="$Date: 2010/10/21 15:06:27 $";
+static const char * const IDENT_INET_C="$Date: 2010/11/24 00:20:47 $";
 
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
@@ -88,13 +88,9 @@ public:
 	 
 };
 
-// using thread local variables instead of keeping them in request
-// not necessary for cgi version
-#ifdef WIN32
-#define __thread __declspec(thread)
-#endif
-__thread CURL *fcurl = 0;
-__thread ParserOptions *foptions = 0;
+// using TLS instead of keeping variables in request
+THREAD_LOCAL CURL *fcurl = 0;
+THREAD_LOCAL ParserOptions *foptions = 0;
 
 static CURL *curl(){
 	if(!fcurl)
@@ -580,8 +576,11 @@ static void _curl_load_action(Request& r
 	VFile& result=*new VFile;
 
 	String::Body ct_header = headers.get(HTTP_CONTENT_TYPE_UPPER);
-	Charset *remote_charset = ct_header.is_empty() ? 0 : detect_charset(ct_header.trim(String::TRIM_BOTH, " \t\n\r").cstr());
-	Charset *asked_charset = options().response_charset ? options().response_charset : (remote_charset ? remote_charset : options().charset);
+	Charset *asked_charset = options().response_charset;
+	if (asked_charset == 0){
+		Charset *remote_charset = ct_header.is_empty() ? 0 : detect_charset(ct_header.trim(String::TRIM_BOTH, " \t\n\r").cstr());
+		asked_charset = remote_charset ? remote_charset : options().charset;
+	}
 
 	if(options().is_text && asked_charset != 0){
 		String::C c=Charset::transcode(String::C(body.buf, body.length), *asked_charset, r.charsets.source());