--- parser3/src/targets/cgi/parser3.C	2005/12/19 11:56:38	1.238
+++ parser3/src/targets/cgi/parser3.C	2007/03/14 12:10:56	1.242
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3_C="$Date: 2005/12/19 11:56:38 $";
+static const char * const IDENT_PARSER3_C="$Date: 2007/03/14 12:10:56 $";
 
 #include "pa_config_includes.h"
 
@@ -115,10 +115,18 @@ static void log(const char* fmt, va_list
 	char buf[MAX_STRING];
 	size_t size=vsnprintf(buf, MAX_STRING, fmt, args);
 	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);
@@ -230,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);
 }
 
@@ -580,7 +588,7 @@ static void call_real_parser_handler__su
 static void usage(const char* program) {
 	printf(
 		"Parser/%s\n"
-		"Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Copyright(c) 2001-2007 ArtLebedev Group (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"