--- parser3/src/main/pa_common.C	2003/04/09 08:01:21	1.143.2.21.2.26
+++ parser3/src/main/pa_common.C	2004/01/22 07:09:50	1.160.2.1
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_COMMON_C="$Date: 2003/04/09 08:01:21 $"; 
+static const char* IDENT_COMMON_C="$Date: 2004/01/22 07:09:50 $"; 
 
 #include "pa_common.h"
 #include "pa_exception.h"
@@ -19,6 +19,8 @@ static const char* IDENT_COMMON_C="$Date
 #ifdef PA_HTTP
 #include "pa_vstring.h"
 #include "pa_vint.h"
+#include "pa_vhash.h"
+#include "pa_vtable.h"
 
 #ifdef CYGWIN
 #define _GNU_H_WINDOWS32_SOCKETS
@@ -133,6 +135,7 @@ const String file_status_name(FILE_STATU
 #define HTTP_HEADERS_NAME "headers"
 #define HTTP_ANY_STATUS_NAME "any-status"
 #define HTTP_CHARSET_NAME "charset"
+#define HTTP_TABLES_NAME "tables"
 
 // statics
 
@@ -141,6 +144,7 @@ static const String http_timeout_name(HT
 static const String http_headers_name(HTTP_HEADERS_NAME);
 static const String http_any_status_name(HTTP_ANY_STATUS_NAME);
 static const String http_charset_name(HTTP_CHARSET_NAME);
+static const String http_tables_name(HTTP_TABLES_NAME);
 
 // defines
 
@@ -168,9 +172,10 @@ void fix_line_breaks(char *str, size_t&
 		} else // \r, not \n = Macintosh
 			bol=eol+1;
 	}
-	// last piece without \r, including terminating 0
+	// last piece without \r
 	if(dest!=bol)
 		memcpy(dest, bol, eob-bol); 
+	str[length]=0; // terminating
 }
 
 char* file_read_text(Request_charsets& charsets, 
@@ -185,6 +190,9 @@ char* file_read_text(Request_charsets& c
 #ifdef PA_HTTP
 //http request stuff
 
+#undef CRLF
+#define CRLF "\r\n"
+
 static bool set_addr(struct sockaddr_in *addr, const char* host, const short port){
     memset(addr, 0, sizeof(*addr)); 
     addr->sin_family=AF_INET;
@@ -208,7 +216,7 @@ static int http_read_response(String& re
 		if(size<=0)
 			break;
 		response.append_strdup(buf, size, String::L_TAINTED); 
-		if(!result && (EOLat=response.pos("\r\n", 2))!=STRING_NOT_FOUND) { // checking status in first response
+		if(!result && (EOLat=response.pos(CRLF, 2))!=STRING_NOT_FOUND) { // checking status in first response
 			const String& status_line=response.mid(0, (size_t)EOLat);
 			ArrayString astatus; 
 			size_t pos_after=0;
@@ -325,7 +333,7 @@ static void http_pass_header(HashStringV
 			     Http_pass_header_info *info) {
     *info->request <<key<<": "
 	<< attributed_meaning_to_string(*value, String::L_HTTP_HEADER, false)
-	<< "\n"; 
+	<< CRLF; 
 	
     if(String(key, String::L_TAINTED).change_case(info->charsets->source(), String::CC_UPPER)=="USER-AGENT")
 	info->user_agent_specified=true;
@@ -333,7 +341,7 @@ static void http_pass_header(HashStringV
 
 
 static Charset* detect_charset(Charset& source_charset, const String& content_type_value) {
-	const StringBody CONTENT_TYPE_VALUE=
+	const String::Body CONTENT_TYPE_VALUE=
 		content_type_value.change_case(source_charset, String::CC_UPPER);
 	// content-type: xxx/xxx; source_charset=WE-NEED-THIS
 	// content-type: xxx/xxx; source_charset="WE-NEED-THIS"
@@ -355,7 +363,7 @@ static Charset* detect_charset(Charset&
 			if(delim_pos!=STRING_NOT_FOUND)
 				charset_end=delim_pos;
 		}
-		const StringBody CHARSET_NAME_BODY=
+		const String::Body CHARSET_NAME_BODY=
 			CONTENT_TYPE_VALUE.mid(charset_begin, charset_end);
 
 		return &charsets.get(CHARSET_NAME_BODY);
@@ -371,6 +379,7 @@ struct File_read_http_result {
 	HashStringValue* headers;
 }; 
 #endif
+/// @todo build .cookies field. use ^file.tables.SET-COOKIES.menu{ for now
 static File_read_http_result file_read_http(Request_charsets& charsets, 
 					    const String& file_spec, 
 					    HashStringValue *options=0) {
@@ -448,8 +457,8 @@ static File_read_http_result file_read_h
 			request<<method;
 		else
 			request<<"GET";
-		request<< " "<< uri <<" HTTP/1.0\n"
-			"host: "<< host <<"\n"; 
+		request<< " "<< uri <<" HTTP/1.0" CRLF
+			"host: "<< host << CRLF; 
 		bool user_agent_specified=false;
 		if(vheaders && !vheaders->is_string()) { // allow empty
 			if(HashStringValue *headers=vheaders->get_hash()) {
@@ -462,8 +471,8 @@ static File_read_http_result file_read_h
 					"headers param must be hash"); 
 		};
 		if(!user_agent_specified) // defaulting
-			request << "user-agent: " DEFAULT_USER_AGENT "\n";
-		request<<"\n"; 
+			request << "user-agent: " DEFAULT_USER_AGENT CRLF;
+		request << CRLF; 
 
 		request_cstr=request.cstr(String::L_UNSPECIFIED);
 	}
@@ -481,7 +490,7 @@ static File_read_http_result file_read_h
 		timeout, fail_on_status_ne_200); 
 	
 	//processing results	
-	size_t pos=response.pos("\r\n\r\n", 4); 
+	size_t pos=response.pos(CRLF CRLF, 4); 
 	if(pos==STRING_NOT_FOUND || pos<1) {
 		throw Exception("http.response", 
 			&connect_string,
@@ -492,8 +501,12 @@ static File_read_http_result file_read_h
 	
 	ArrayString aheaders;
 	result.headers=new HashStringValue;
+	VHash* vtables=new VHash;
+	result.headers->put(http_tables_name, vtables);
+	HashStringValue& tables=vtables->hash();
+
 	size_t pos_after=0;
-	header_block.split(aheaders, pos_after, "\r\n"); 
+	header_block.split(aheaders, pos_after, CRLF); 
 	
 	//processing headers
 	size_t aheaders_count=aheaders.count();
@@ -505,11 +518,35 @@ static File_read_http_result file_read_h
 			throw Exception("http.response", 
 				&connect_string,
 				"bad response from host - bad header \"%s\"", line.cstr());
-		const StringBody HEADER_NAME=
+		const String::Body HEADER_NAME=
 			line.mid(0, pos).change_case(charsets.source(), String::CC_UPPER);
 		const String& header_value=line.mid(pos+2, line.length());
 		if(HEADER_NAME=="CONTENT-TYPE")
 			real_remote_charset=detect_charset(charsets.source(), header_value);
+
+		// tables
+		{
+			Value *valready=(Value *)tables.get(HEADER_NAME);
+			bool existed=valready!=0;
+			Table *table;
+			if(existed) {
+				// second+ appearence
+				table=valready->get_table();
+			} else {
+				// first appearence
+				Table::columns_type columns =new ArrayString(1);
+				*columns+=new String("value");
+				table=new Table(columns);
+			}
+			// this string becomes next row
+			ArrayString& row=*new ArrayString(1);
+			row+=&header_value;
+			*table+=&row;
+			// not existed before? add it
+			if(!existed)
+				tables.put(HEADER_NAME, new VTable(table));
+		}
+
 		result.headers->put(HEADER_NAME, new VString(header_value));
 	}
 	// defaulting to used-asked charset [it's never empty!]
@@ -548,7 +585,7 @@ static void file_read_action(
 		if(ssize_t(*info.data_size)<0 || *info.data_size>to_read_size)
 			throw Exception(0, 
 				&file_spec, 
-				"read failed: actually read %lu bytes count not in [0..%lu] valid range", 
+				"read failed: actually read %l bytes count not in [0..%lu] valid range", 
 					*info.data_size, to_read_size); 
 	} else { // empty file
 		if(as_text) {
@@ -586,7 +623,7 @@ File_read_result file_read(Request_chars
 		// UTF-8 signature: EF BB BF
 		if(result.length>=3) {
 			char *in=(char *)result.str;
-			if(strncmp(in, "\xEB\xBB\xBF", 3)==0) {
+			if(strncmp(in, "\xEF\xBB\xBF", 3)==0) {
 				result.str=in+3; result.length-=3;// skip prefix
 			}
 		}
@@ -600,7 +637,7 @@ File_read_result file_read(Request_chars
 }
 
 #ifdef PA_SAFE_MODE 
-void check_safe_mode(stat finfo, const String& file_spec, const char* fname) { 
+void check_safe_mode(struct stat finfo, const String& file_spec, const char* fname) { 
 	if(finfo.st_uid/*foreign?*/!=geteuid() 
 		&& finfo.st_gid/*foreign?*/!=getegid()) 
 		throw Exception("parser.runtime",  
@@ -1062,6 +1099,11 @@ int __vsnprintf(char* b, size_t s, const
 	// note: on win32& maybe somewhere else
 	// vsnprintf do not writes terminating 0 in 'buffer full' case, reducing
 	--s;
+
+	// clients do not check for negative 's', feature: ignore such prints
+	if((ssize_t)s<0)
+		return 0;
+
 #if _MSC_VER
 	/*
 	win32: