--- parser3/src/classes/curl.C	2010/10/21 15:06:27	1.7
+++ parser3/src/classes/curl.C	2012/03/16 09:24:06	1.13
@@ -1,15 +1,13 @@
 /** @file
 	Parser: @b curl parser class.
 
-	Copyright(c) 2001-2009 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 */
 
 #include "pa_config_includes.h"
 
 #ifdef HAVE_CURL
 
-static const char * const IDENT_INET_C="$Date: 2010/10/21 15:06:27 $";
-
 #include "pa_vmethod_frame.h"
 #include "pa_request.h"
 #include "pa_vfile.h"
@@ -17,8 +15,11 @@ static const char * const IDENT_INET_C="
 #include "pa_vstring.h"
 #include "pa_vtable.h"
 #include "pa_common.h"
+#include "pa_http.h" 
 #include "ltdl.h"
 
+volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.13 2012/03/16 09:24:06 moko Exp $";
+
 class MCurl: public Methoded {
 public:
 	MCurl();
@@ -28,9 +29,6 @@ public:
 
 DECLARE_CLASS_VAR(curl, new MCurl, 0);
 
-// from file.C
-extern bool is_text_mode(const String& mode);
-
 #include "curl.h"
 
 typedef CURL *(*t_curl_easy_init)(); t_curl_easy_init f_curl_easy_init;
@@ -75,7 +73,7 @@ const char *dlink(const char *dlopen_fil
 
 class ParserOptions {
 public:
-	const char *filename;
+	const String *filename;
 	const String *content_type;
 	bool is_text;
 	Charset *charset, *response_charset;
@@ -88,13 +86,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)
@@ -249,7 +243,9 @@ public:
 		CURL_OPT(CURL_INT, HTTP_TRANSFER_DECODING);
 
 		CURL_OPT(CURL_INT, MAXREDIRS);
+#ifdef CURLOPT_POSTREDIR
 		CURL_OPT(CURL_INT, POSTREDIR);
+#endif
 
 		CURL_OPT(CURL_STRING, RANGE);
 
@@ -318,9 +314,9 @@ static struct curl_slist *curl_headers(H
 
 	for(HashStringValue::Iterator i(*value_hash); i; i.next() ){
 		String header = 
-			String(capitalize(i.key().cstr()), String::L_URI)
+			String(pa_http_safe_header_name(capitalize(i.key().cstr())), String::L_AS_IS)
 			<< ": " 
-			<< String(i.value()->as_string(), String::L_URI);
+			<< String(i.value()->as_string(), String::L_HTTP_HEADER);
 
 		slist=f_curl_slist_append(slist, curl_urlencode(header, r));
 	}
@@ -448,7 +444,7 @@ static void curl_setopt(HashStringValue:
 		}
 		case CurlOption::PARSER_NAME:{
 			// 'name' parser option
-			options().filename=v.as_string().taint_cstr(String::L_FILE_SPEC);
+			options().filename=&v.as_string();
 			break;
 		}
 		case CurlOption::PARSER_CONTENT_TYPE:{
@@ -458,7 +454,7 @@ static void curl_setopt(HashStringValue:
 		}
 		case CurlOption::PARSER_MODE:{
 			// 'mode' parser option
-			options().is_text=is_text_mode(v.as_string());
+			options().is_text=VFile::is_text_mode(v.as_string());
 			break;
 		}
 		case CurlOption::PARSER_CHARSET:{
@@ -467,7 +463,7 @@ static void curl_setopt(HashStringValue:
 			break;
 		}
 		case CurlOption::PARSER_RESPONSE_CHARSET:{
-			// 'charset' parser option
+			// 'response-charset' parser option
 			options().response_charset=&::charsets.get(v.as_string().change_case(r.charsets.source(), String::CC_UPPER));
 			break;
 		}
@@ -573,15 +569,14 @@ static void _curl_load_action(Request& r
 	// assure trailing zero
 	body.buf[body.length]=0;
 
-	Value* vcontent_type=
-		options().content_type ? new VString(*options().content_type) :
-		options().filename ? new VString(r.mime_type_of(options().filename)) : 0;
-
 	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());
@@ -589,7 +584,9 @@ static void _curl_load_action(Request& r
 		body.length=c.length;
 	}
 
-	result.set(true /*tainted*/, body.buf, body.length, options().filename, vcontent_type);
+	result.set(true /*tainted*/, body.buf, body.length, options().filename
+				, options().content_type ? new VString(*options().content_type) : 0
+				, &r);
 	result.set_mode(options().is_text);
 
 	long http_status = 0;