--- parser3/src/classes/curl.C	2018/08/24 16:31:06	1.60
+++ parser3/src/classes/curl.C	2020/10/10 09:05:42	1.62
@@ -17,7 +17,7 @@
 #include "pa_http.h" 
 #include "ltdl.h"
 
-volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.60 2018/08/24 16:31:06 moko Exp $";
+volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.62 2020/10/10 09:05:42 moko Exp $";
 
 class MCurl: public Methoded {
 public:
@@ -310,38 +310,41 @@ struct CurlInfo : public PA_Allocated{
 	CurlInfo(CURLINFO aid, OptionType atype): id(aid), type(atype) {}
 };
 
-class CurlInfoHash: public HashString<CurlInfo*> {
+class CurlInfoHash: public OrderedHashString<CurlInfo*> {
 public:
 	CurlInfoHash() {
 #define	CURL_INF(type, name) put(str_lower(#name),new CurlInfo(CURLINFO_##name, CurlInfo::type));
+		CURL_INF(CURL_STRING, SCHEME);
+		CURL_INF(CURL_HTTP_VERSION, HTTP_VERSION);
+		CURL_INF(CURL_STRING, EFFECTIVE_URL);
+		CURL_INF(CURL_STRING, CONTENT_TYPE);
+		CURL_INF(CURL_INT, RESPONSE_CODE);
+		CURL_INF(CURL_INT, OS_ERRNO);
+
+		CURL_INF(CURL_DOUBLE, NAMELOOKUP_TIME);
 		CURL_INF(CURL_DOUBLE, APPCONNECT_TIME);
+		CURL_INF(CURL_DOUBLE, PRETRANSFER_TIME);
+		CURL_INF(CURL_DOUBLE, STARTTRANSFER_TIME);
 		CURL_INF(CURL_DOUBLE, CONNECT_TIME);
+		CURL_INF(CURL_DOUBLE, TOTAL_TIME);
+
 		CURL_INF(CURL_DOUBLE, CONTENT_LENGTH_DOWNLOAD);
 		CURL_INF(CURL_DOUBLE, CONTENT_LENGTH_UPLOAD);
-		CURL_INF(CURL_STRING, CONTENT_TYPE);
-		CURL_INF(CURL_STRING, EFFECTIVE_URL);
 		CURL_INF(CURL_INT, HEADER_SIZE);
-		CURL_INF(CURL_INT, HTTPAUTH_AVAIL);
-		CURL_INF(CURL_DOUBLE, NAMELOOKUP_TIME);
+		CURL_INF(CURL_INT, REQUEST_SIZE);
+		CURL_INF(CURL_DOUBLE, SIZE_DOWNLOAD);
+		CURL_INF(CURL_DOUBLE, SIZE_UPLOAD);
+		CURL_INF(CURL_DOUBLE, SPEED_DOWNLOAD);
+		CURL_INF(CURL_DOUBLE, SPEED_UPLOAD);
+
 		CURL_INF(CURL_INT, NUM_CONNECTS);
-		CURL_INF(CURL_INT, OS_ERRNO);
-		CURL_INF(CURL_DOUBLE, PRETRANSFER_TIME);
 		CURL_INF(CURL_STRING, PRIMARY_IP);
+		CURL_INF(CURL_INT, HTTPAUTH_AVAIL);
 		CURL_INF(CURL_INT, PROXYAUTH_AVAIL);
 		CURL_INF(CURL_INT, REDIRECT_COUNT);
 		CURL_INF(CURL_DOUBLE, REDIRECT_TIME);
 		CURL_INF(CURL_STRING, REDIRECT_URL);
-		CURL_INF(CURL_INT, REQUEST_SIZE);
-		CURL_INF(CURL_INT, RESPONSE_CODE);
-		CURL_INF(CURL_DOUBLE, SIZE_DOWNLOAD);
-		CURL_INF(CURL_DOUBLE, SIZE_UPLOAD);
-		CURL_INF(CURL_DOUBLE, SPEED_DOWNLOAD);
-		CURL_INF(CURL_DOUBLE, SPEED_UPLOAD);
 		CURL_INF(CURL_INT, SSL_VERIFYRESULT);
-		CURL_INF(CURL_DOUBLE, STARTTRANSFER_TIME);
-		CURL_INF(CURL_DOUBLE, TOTAL_TIME);
-		CURL_INF(CURL_HTTP_VERSION, HTTP_VERSION);
-		CURL_INF(CURL_STRING, SCHEME);
 	}
 
 } *curl_infos=0;
@@ -652,9 +655,9 @@ public:
 	char *buf;
 	size_t length;
 	size_t buf_size;
-	ResponseHeaders& headers;
+	HTTP_Headers& headers;
 
-	Curl_buffer(ResponseHeaders& aheaders) : buf((char *)pa_malloc_atomic(MAX_STRING)), length(0), buf_size(MAX_STRING-1), headers(aheaders){}
+	Curl_buffer(HTTP_Headers& aheaders) : buf((char *)pa_malloc_atomic(MAX_STRING)), length(0), buf_size(MAX_STRING-1), headers(aheaders){}
 
 	void resize(size_t size){
 		buf_size=size;
@@ -677,7 +680,7 @@ static int curl_writer(char *data, size_
 	return size;
 }
 
-static int curl_header(char *data, size_t size, size_t nmemb, ResponseHeaders *result){
+static int curl_header(char *data, size_t size, size_t nmemb, HTTP_Headers *result){
 	if(result == 0)
 		return 0;
 
@@ -708,7 +711,7 @@ static void _curl_load_action(Request& r
 	CURLcode res;
 
 	// we need a container for headers as VFile fields can be put only after VFile.set
-	ResponseHeaders response;
+	HTTP_Headers response;
 	CURL_SETOPT(CURLOPT_HEADERFUNCTION, curl_header, "curl header function");
 	CURL_SETOPT(CURLOPT_WRITEHEADER, &response, "curl header buffer");
 
@@ -780,8 +783,8 @@ static void _curl_load_action(Request& r
 	VHash* vtables=new VHash;
 	result.fields().put("tables", vtables);
 
-	for(Array_iterator<ResponseHeaders::Header> i(response.headers); i.has_next(); ){
-		ResponseHeaders::Header header=i.next();
+	for(Array_iterator<HTTP_Headers::Header> i(response.headers); i.has_next(); ){
+		HTTP_Headers::Header header=i.next();
 
 		if(asked_charset)
 			header.transcode(*asked_charset, r.charsets.source());