--- parser3/src/targets/cgi/parser3.C	2007/11/09 14:42:09	1.245
+++ parser3/src/targets/cgi/parser3.C	2009/08/27 10:21:28	1.252
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3_C="$Date: 2007/11/09 14:42:09 $";
+static const char * const IDENT_PARSER3_C="$Date: 2009/08/27 10:21:28 $";
 
 #include "pa_config_includes.h"
 
@@ -112,9 +112,9 @@ static void log(const char* fmt, va_list
 	}
 	// message
 
-	char buf[MAX_STRING];
-	size_t size=vsnprintf(buf, MAX_STRING, fmt, args);
-	remove_crlf(buf, buf+size);
+	char buf[MAX_LOG_STRING];
+	size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args);
+	size=remove_crlf(buf, buf+size);
 	fwrite(buf, size, 1, f);
 
 	if(request_info)
@@ -166,7 +166,7 @@ static void die_or_abort(const char* fmt
 	// prepare header
 	// let's be honest, that's bad we couldn't produce valid output
 	SAPI::add_header_attribute(SAPI_info, "status", "500");
-	SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain");
+	SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE, "text/plain");
 	char content_length_cstr[MAX_NUMBER];
 	snprintf(content_length_cstr, sizeof(content_length_cstr), "%u", content_length);
 	SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr);
@@ -302,7 +302,7 @@ static const String sigpipe_name(SIGPIPE
 static void SIGPIPE_handler(int /*sig*/){
 	Value* sigpipe=0;
 	if(request)
-		sigpipe=request->main_class.get_element(sigpipe_name, request->main_class, false);
+		sigpipe=request->main_class.get_element(sigpipe_name);
 	if(sigpipe && sigpipe->as_bool())
 		log_signal(SIGPIPE_NAME);
 
@@ -598,7 +598,7 @@ static void call_real_parser_handler__su
 static void usage(const char* program) {
 	printf(
 		"Parser/%s\n"
-		"Copyright(c) 2001-2007 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"
@@ -613,7 +613,7 @@ static void usage(const char* program) {
 	exit(EINVAL);
 }
 
-int main(size_t argc, char *argv[]) {
+int main(int argc, char *argv[]) {
 #ifdef PA_DEBUG_CGI_ENTRY_EXIT
 	log("main: entry");
 #endif
@@ -675,7 +675,7 @@ int main(size_t argc, char *argv[]) {
 		if(raw_filespec_to_process && !*raw_filespec_to_process)
 			raw_filespec_to_process=0;
 	} else {
-		size_t optind=1;
+		int optind=1;
 		while(optind < argc){
 			char *carg = argv[optind];
 			if(carg[0] != '-')
@@ -764,7 +764,7 @@ int main(size_t argc, char *argv[]) {
 		int content_length=strlen(buf);
 
 		// prepare header
-		SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain");
+		SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE, "text/plain");
 		char content_length_cstr[MAX_NUMBER];
 		snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length);
 		SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr);