--- parser3/src/targets/cgi/parser3.C	2001/03/15 09:37:56	1.13
+++ parser3/src/targets/cgi/parser3.C	2001/03/18 14:45:30	1.19
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: parser3.C,v 1.13 2001/03/15 09:37:56 paf Exp $
+	$Id: parser3.C,v 1.19 2001/03/18 14:45:30 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
 Pool pool; // global pool
 
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 // intercept global system errors
 LONG WINAPI TopLevelExceptionFilter (
 									 struct _EXCEPTION_POINTERS *ExceptionInfo
@@ -55,6 +55,8 @@ LONG WINAPI TopLevelExceptionFilter (
 #	endif
 #endif
 
+// service funcs
+
 int read_post(char *buf, int max_bytes) {
 	int read_size=0;
 	do {
@@ -68,6 +70,17 @@ int read_post(char *buf, int max_bytes)
 	return read_size;
 }
 
+void output_header_attribute(const char *key, const char *value) {
+	printf("%s: %s\n", key, value);
+}
+
+void output_body(const char *buf, size_t size) {
+	puts(""); // header | body  delimiter
+	stdout_write(buf, size);
+}
+
+// main
+
 int main(int argc, char *argv[]) {
 	//TODO: umask(2);
 #ifdef WIN32
@@ -78,6 +91,8 @@ int main(int argc, char *argv[]) {
 
 	// Service funcs 
 	service_funcs.read_post=read_post;
+	service_funcs.output_header_attribute=output_header_attribute;
+	service_funcs.output_body=output_body;
 	
 	// were we started as CGI?
 	bool cgi=
@@ -96,11 +111,10 @@ int main(int argc, char *argv[]) {
 
 	const char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
 
-	char *result;  char error[MAX_STRING];  error[0]=0;
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 		SetUnhandledExceptionFilter(&TopLevelExceptionFilter);
 		//TODO: initSocks();
 #	endif
@@ -126,9 +140,9 @@ int main(int argc, char *argv[]) {
 		}
 		request_info.document_root=document_root;
 		request_info.path_translated=filespec_to_process;
-		request_info.request_method=getenv("REQUEST_METHOD");
+		request_info.method=getenv("REQUEST_METHOD");
 		request_info.query_string=getenv("QUERY_STRING");
-		request_info.request_uri=getenv("REQUEST_URI");
+		request_info.uri=getenv("REQUEST_URI");
 		request_info.content_type=getenv("CONTENT_TYPE");
 		const char *content_length=getenv("CONTENT_LENGTH");
 		request_info.content_length=(content_length?atoi(content_length):0);
@@ -136,7 +150,7 @@ int main(int argc, char *argv[]) {
 		// prepare to process request
 		Request request(Pool(),
 			request_info,
-			cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO
+			1||cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO
 			);
 		
 		// some root-controlled location
@@ -158,48 +172,42 @@ int main(int argc, char *argv[]) {
 		strcat(sys_auto_path2, PATH_DELIMITER_STRING);
 		
 		// process the request
-		result=request.core(
+		request.core(pool.exception(),
 			sys_auto_path1, 
 			sys_auto_path2);
-		// set error, will be reported in case result==0
-		strcpy(error, "exception occured in request exception handler");
+		// no actions with request' data past this point
+		// request.exception not not handled here, but all
+		// request' data are associated with it's pool=exception
 
-		// must be last in PTRY{}PCATCH
+			// must be last in PTRY{}PCATCH
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 		SetUnhandledExceptionFilter(0);
 #	endif
+		// successful finish
+		return 0;
 #endif
-	} PCATCH(e) { // global problem @globals fill @Request create @prepare to .core()
-		result=0;
-		strcpy(error, e.comment());
-	}
-	PEND_CATCH
+	} PCATCH(e) { // global problem 
+		// @globals fill 
+		// @Request create 
+		// @prepare to .core()
+		// @request.core when reporting request exception
+		// @write result
+		const char *body=e.comment();
+		int content_length=strlen(body);
+
+		// header
+		(*service_funcs.output_header_attribute)("content-type", "text/plain");
+		char content_length_cstr[MAX_NUMBER];
+		snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length);
+		(*service_funcs.output_header_attribute)("content-length", 
+			content_length_cstr);
 
-	// write out the result	
-	if(cgi) {
-		if(result) {
-			const char *content_type="text/html";
-			printf(
-				"Content-type: %s\n"
-				"Content-length: %d\n"
-				"\n", 
-				content_type,
-				strlen(result));
-			stdout_write(result);
-		} else {
-			printf(
-				"Content-type: text/plain\n"
-				"Content-length: %d\n"
-				"\n", 
-				strlen(error));
-			stdout_write(error);
-		}
-	} else
-		if(result)
-			printf("%s", result);
-		else
-			fputs(error, stderr);
+		// body
+		(*service_funcs.output_body)(body, content_length);
 
-	return 0;
+		// unsuccessful finish
+		return 1;
+	}
+	PEND_CATCH
 }