--- parser3/src/main/pa_common.C	2004/07/26 10:44:21	1.187
+++ parser3/src/main/pa_common.C	2004/08/30 09:36:41	1.193
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_COMMON_C="$Date: 2004/07/26 10:44:21 $"; 
+static const char * const IDENT_COMMON_C="$Date: 2004/08/30 09:36:41 $"; 
 
 #include "pa_common.h"
 #include "pa_exception.h"
@@ -171,7 +171,7 @@ static int http_read_response(char*& res
 		response_size+=received_size;
 		response[response_size]=0;
 
-		if(!result && (EOLat=strstr(response, CRLF))) { // checking status in first response
+		if(!result && (EOLat=strstr(response, "\n"))) { // checking status in first response
 			const String status_line(pa_strdup(response, EOLat-response));
 			ArrayString astatus; 
 			size_t pos_after=0;
@@ -207,7 +207,7 @@ static void timeout_handler(int sig){
 #endif
 
 static int http_request(char*& response, size_t& response_size,
-			const char* host, int port, 
+			const char* host, short port, 
 			const char* request, 
 			int 
 #ifdef PA_USE_ALARM
@@ -401,7 +401,7 @@ static File_read_http_result file_read_h
 	File_read_http_result result;
 	char host[MAX_STRING]; 
 	const char* uri; 
-	int port;
+	short port;
 	const char* method="GET"; bool method_is_get;
 	HashStringValue* form=0;
 	const char* body_cstr=0;
@@ -489,7 +489,7 @@ static File_read_http_result file_read_h
 		uri=host_uri?current+(host_uri-1-host):"/"; 
 		char* port_cstr=lsplit(host, ':'); 
 		char* error_pos=0;
-		port=port_cstr?strtol(port_cstr, &error_pos, 0):80;
+		port=port_cstr?(short)strtol(port_cstr, &error_pos, 0):80;
 
 		if(strchr(uri, '?') && form)
 			throw Exception("parser.runtime",
@@ -564,14 +564,26 @@ static File_read_http_result file_read_h
 	
 	//processing results	
 	char* raw_body; size_t raw_body_size;
-	char* headers_end_at=strstr(response, CRLF CRLF /*change '4' below along!*/); 
-	if(headers_end_at) {
-		raw_body=headers_end_at+4;
-		raw_body_size=response_size-(raw_body-response);
-	} else
-		throw Exception("http.response", 
-			&connect_string,
-			"bad response from host - no headers found"); 
+	char* headers_end_at=strstr(response, "\n\n"  /*change '2' below along!*/);
+	if(headers_end_at)
+		raw_body=headers_end_at+2;
+	else {
+		headers_end_at=strstr(response, CRLF CRLF /*change '4' below along!*/); 
+		if(headers_end_at)
+			raw_body=headers_end_at+4;
+		else {
+			// yandex web server (http://localhost:17000) 
+			// returns "\n\r\n"
+			headers_end_at=strstr(response, "\n\r\n" /*change '3' below along!*/); 
+			if(!headers_end_at)
+				throw Exception("http.response", 
+					&connect_string,
+					"bad response from host - no headers found"); 
+
+			raw_body=headers_end_at+3;
+		}
+	}
+	raw_body_size=response_size-(raw_body-response);
 	
 	*headers_end_at=0;
 	const String header_block(response, headers_end_at-response, true);
@@ -598,7 +610,7 @@ static File_read_http_result file_read_h
 		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")
+		if(as_text && HEADER_NAME=="CONTENT-TYPE")
 			real_remote_charset=detect_charset(charsets.source(), header_value);
 
 		// tables
@@ -626,14 +638,15 @@ static File_read_http_result file_read_h
 
 		result.headers->put(HEADER_NAME, new VString(header_value));
 	}
-	// defaulting to used-asked charset [it's never empty!]
-	if(!real_remote_charset)
-		real_remote_charset=asked_remote_charset;
 
 	// output response
 	String::C real_body=String::C(raw_body, raw_body_size);
-	if(as_text && raw_body_size) // must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below
+	if(as_text && raw_body_size) { // must be checked because transcode returns CONST string in case length==0, which contradicts hacking few lines below
+		// defaulting to used-asked charset [it's never empty!]
+		if(!real_remote_charset)
+			real_remote_charset=asked_remote_charset;
 		real_body=Charset::transcode(real_body, *real_remote_charset, charsets.source());
+	}
 
 	result.str=const_cast<char *>(real_body.str); // hacking a little
 	result.length=real_body.length;
@@ -646,6 +659,7 @@ static File_read_http_result file_read_h
 #ifndef DOXYGEN
 struct File_read_action_info {
 	char **data; size_t *data_size;
+	char* buf; size_t offset; size_t count;
 }; 
 #endif
 static void file_read_action(
@@ -654,8 +668,16 @@ static void file_read_action(
 			     const String& file_spec, const char* /*fname*/, bool as_text, 
 			     void *context) {
 	File_read_action_info& info=*static_cast<File_read_action_info *>(context); 
-	if(size_t to_read_size=(size_t)finfo.st_size) { 
-		*info.data=new(PointerFreeGC) char[to_read_size+(as_text?1:0)]; 
+	size_t to_read_size=info.count;
+	if(!to_read_size)
+		to_read_size=(size_t)finfo.st_size;
+	assert( !(info.buf && as_text) );
+	if(to_read_size) { 
+		if(info.offset)
+			lseek(f, info.offset, SEEK_SET);
+		*info.data=info.buf
+			? info.buf
+			: new(PointerFreeGC) char[to_read_size+(as_text?1:0)]; 
 		*info.data_size=(size_t)read(f, *info.data, to_read_size); 
 
 		if(ssize_t(*info.data_size)<0 || *info.data_size>to_read_size)
@@ -675,7 +697,8 @@ static void file_read_action(
 }
 File_read_result file_read(Request_charsets& charsets, const String& file_spec, 
 			   bool as_text, HashStringValue *params,
-			   bool fail_on_read_problem) {
+			   bool fail_on_read_problem,
+			   char* buf, size_t offset, size_t count) {
 	File_read_result result={false, 0, 0, 0};
 #ifdef PA_HTTP
 	if(file_spec.starts_with("http://")) {
@@ -692,7 +715,8 @@ File_read_result file_read(Request_chars
 				0,
 				"invalid option passed");
 
-		File_read_action_info info={&result.str, &result.length}; 
+		File_read_action_info info={&result.str, &result.length,
+			buf, offset, count}; 
 		result.success=file_read_action_under_lock(file_spec, 
 			"read", file_read_action, &info, 
 			as_text, fail_on_read_problem); 
@@ -1069,11 +1093,11 @@ char* unescape_chars(const char* cp, int
 		EscapeFirst, 
 		EscapeSecond
 	} escapeState=EscapeRest;
-	int escapedValue=0;
+	uchar escapedValue=0;
 	int srcPos=0;
 	int dstPos=0;
 	while(srcPos < len) {
-		int ch=cp[srcPos]; 
+		uchar ch=(uchar)cp[srcPos]; 
 		switch(escapeState) {
 			case EscapeRest:
 			if(ch=='%') {
@@ -1085,7 +1109,7 @@ char* unescape_chars(const char* cp, int
 			}
 			break;
 			case EscapeFirst:
-			escapedValue=hex_value[ch] << 4;	
+			escapedValue=(uchar)(hex_value[ch] << 4);
 			escapeState=EscapeSecond;
 			break;
 			case EscapeSecond:
@@ -1126,8 +1150,8 @@ bool StrEqNc(const char* s1, const char*
 				return !strict;
 		} else if(!(*s2))
 			return !strict;
-		if(isalpha(*s1)) {
-			if(tolower(*s1) !=tolower(*s2))
+		if(isalpha((unsigned char)*s1)) {
+			if(tolower((unsigned char)*s1) !=tolower((unsigned char)*s2))
 				return false;
 		} else if((*s1) !=(*s2))
 			return false;