--- parser3/src/classes/curl.C	2012/04/24 21:53:32	1.19
+++ parser3/src/classes/curl.C	2012/06/15 11:54:18	1.22
@@ -16,7 +16,7 @@
 #include "pa_http.h" 
 #include "ltdl.h"
 
-volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.19 2012/04/24 21:53:32 moko Exp $";
+volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.22 2012/06/15 11:54:18 moko Exp $";
 
 class MCurl: public Methoded {
 public:
@@ -493,10 +493,8 @@ static void _curl_options(Request& r, Me
 	if(curl_options==0)
 		curl_options=new CurlOptionHash();
 
-	if(HashStringValue* options=params.as_no_junction(0, OPTIONS_MUST_NOT_BE_CODE).get_hash()){
+	if(HashStringValue* options=params.as_hash(0))
 		options->for_each<Request&>(curl_setopt, r);
-	} else
-		throw Exception("curl", 0, OPTIONS_MUST_BE_HASH);
 }
 
 
@@ -600,11 +598,8 @@ static void _curl_load_action(Request& r
 		body.length=c.length;
 	}
 
-	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);
-
+	result.set(true/*tainted*/, options().is_text, body.buf, body.length, options().filename
+				, options().content_type ? new VString(*options().content_type) : 0, &r);
 	long http_status = 0;
 	if(f_curl_easy_getinfo(curl(), CURLINFO_RESPONSE_CODE, &http_status) == CURLE_OK){
 		result.fields().put("status", new VInt(http_status));