--- parser3/src/targets/cgi/parser3.C	2004/11/09 11:34:06	1.233
+++ 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-2004 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: 2004/11/09 11:34:06 $";
+static const char * const IDENT_PARSER3_C="$Date: 2009/08/27 10:21:28 $";
 
 #include "pa_config_includes.h"
 
@@ -22,15 +22,12 @@ static const char * const IDENT_PARSER3_
 
 #ifdef WIN32
 #	include <windows.h>
-#	include "getopt.h"
-#else
-#	include <getopt.h>
 #endif
 
 // defines
 
 // comment remove me after debugging
-#define PA_DEBUG_CGI_ENTRY_EXIT	"c:\\parser3.log"
+//#define PA_DEBUG_CGI_ENTRY_EXIT	"c:\\parser\\debug-parser3.log"
 
 #if _MSC_VER && !defined(_DEBUG)
 #	define PA_SUPPRESS_SYSTEM_EXCEPTION
@@ -51,6 +48,9 @@ static const char* argv0;
 static const char* config_filespec_cstr=0;
 static bool fail_on_config_read_problem=true;
 
+static int args_skip=1;
+static char** argv_all = NULL;
+
 static bool cgi; ///< we were started as CGI?
 static bool mail_received=false; ///< we were started with -m option? [asked to parse incoming message to $mail:received]
 
@@ -107,30 +107,40 @@ static void log(const char* fmt, va_list
 	if(const char* stamp=ctime(&t)) { // never saw that
 		if(size_t len=strlen(stamp)) // saw once stamp being =""
 			fprintf(f, "[%.*s] [%u] ", len-1, stamp,
-			getpid()
+			(unsigned int)getpid()
 			);
 	}
 	// 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)
+		fprintf(f, " [uri=%s, method=%s, cl=%u]",
+			request_info->uri? request_info->uri: "<unknown>",
+			request_info->method? request_info->method: "<unknown>",
+			request_info->content_length);
+	else
+		fputs(" [no request info]", f);
+
 	// newline
-	fprintf(f, "\n");
+	fputs("\n", f);
 
 	if(opened)
 		fclose(f);
 	else
 		fflush(f);
 }
+#ifdef PA_DEBUG_CGI_ENTRY_EXIT
 static void log(const char* fmt, ...) {
     va_list args;
 	va_start(args,fmt);
 	log(fmt, args);
 	va_end(args);
 }
+#endif
 
 // appends to parser3.log located beside my binary if openable, to stderr otherwize
 void SAPI::log(SAPI_Info&, const char* fmt, ...) {
@@ -156,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);
@@ -187,14 +197,14 @@ void SAPI::die(const char* fmt, ...) {
     va_list args;
 	va_start(args, fmt);
 	die_or_abort(fmt, args, false/*write core?*/);
-	va_end(args);
+//unreachable anyway	va_end(args);
 }
 
 void SAPI::abort(const char* fmt, ...) {
     va_list args;
 	va_start(args, fmt);
 	die_or_abort(fmt, args, true/*write core?*/);
-	va_end(args);
+//unreachable anyway	va_end(args);
 }
 
 char* SAPI::get_env(SAPI_Info& , const char* name) {
@@ -228,7 +238,7 @@ size_t SAPI::read_post(SAPI_Info& , char
 }
 
 void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) {
-	if(cgi)
+	if( cgi && (!request || !request->console.was_used()) )
 		printf("%s: %s\n", dont_store_key, dont_store_value);
 }
 
@@ -287,8 +297,15 @@ static void SIGUSR1_handler(int /*sig*/)
 #endif
 
 #ifdef SIGPIPE
+#define SIGPIPE_NAME "SIGPIPE"
+static const String sigpipe_name(SIGPIPE_NAME);
 static void SIGPIPE_handler(int /*sig*/){
-	log_signal("SIGPIPE");
+	Value* sigpipe=0;
+	if(request)
+		sigpipe=request->main_class.get_element(sigpipe_name);
+	if(sigpipe && sigpipe->as_bool())
+		log_signal(SIGPIPE_NAME);
+
 	execution_canceled=true;
 	if(request)
 		request->set_interrupted(true);
@@ -374,7 +391,7 @@ static void real_parser_handler(const ch
 			memcpy(document_root_buf, filespec_to_process, len); document_root_buf[len]=0;
 			request_info.document_root=document_root_buf;
 		} else
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)");
 	} else {
@@ -458,6 +475,9 @@ static void real_parser_handler(const ch
 	request_info.cookie=getenv("HTTP_COOKIE");
 	request_info.mail_received=mail_received;
 
+	request_info.argv=argv_all;
+	request_info.args_skip=args_skip;
+
 	// get request_info ptr for signal handlers
 	::request_info=&request_info;
 	if(execution_canceled)
@@ -577,7 +597,8 @@ static void call_real_parser_handler__su
 
 static void usage(const char* program) {
 	printf(
-		"Parser/%s Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Parser/%s\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"
@@ -636,6 +657,7 @@ int main(int argc, char *argv[]) {
 #ifdef _DEBUG
 	//_crtBreakAlloc=46;
 #endif
+	argv_all=argv;
 	argv0=argv[0];
 
 	umask(2);
@@ -653,38 +675,44 @@ int main(int argc, char *argv[]) {
 		if(raw_filespec_to_process && !*raw_filespec_to_process)
 			raw_filespec_to_process=0;
 	} else {
-		optind = 1;
-		opterr = 0;
-		int c;
-		while((c = getopt(argc, argv, "hf:"
-#ifdef WITH_MAILRECEIVE
-			"m"
-#endif
-			)) > 0) {
-			switch (c) {
-			case 'h':
-				usage(argv[0]);
-				break;
-			case 'f':
-				config_filespec_cstr=optarg;
+		int optind=1;
+		while(optind < argc){
+			char *carg = argv[optind];
+			if(carg[0] != '-')
 				break;
+
+			for(size_t k = 1; k < strlen(carg); k++){
+				char c = carg[k];
+				switch (c) {
+					case 'h':
+						usage(argv[0]);
+						break;
+					case 'f':
+						if(optind < argc - 1){
+							optind++;
+							config_filespec_cstr=argv[optind];
+						}
+						break;
 #ifdef WITH_MAILRECEIVE
-			case 'm':
-				mail_received=true;
-				break;
-#endif
-			default:
-				fprintf(stderr, "%s: invalid option '%c'\n", argv[0], optopt);
-				usage(argv[0]);
-				break;
+					case 'm':
+						mail_received=true;
+						break;
+#endif
+					default:
+						fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c);
+						usage(argv[0]);
+						break;
+				}
 			}
+			optind++;
 		}
-		if (optind != argc - 1) {
+		
+		if (optind > argc - 1) {
 			fprintf(stderr, "%s: file not specified\n", argv[0]);
 			usage(argv[0]);
 		}
-		
-		raw_filespec_to_process=argv[optind++];
+		raw_filespec_to_process=argv[optind];
+		args_skip=optind;
 	}
 
 #ifdef WIN32
@@ -736,7 +764,7 @@ int main(int 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);