--- parser3/src/targets/cgi/parser3.C	2001/08/31 15:35:34	1.99
+++ parser3/src/targets/cgi/parser3.C	2001/09/04 19:03:23	1.107
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 */
-static const char *RCSId="$Id: parser3.C,v 1.99 2001/08/31 15:35:34 parser Exp $"; 
+static const char *RCSId="$Id: parser3.C,v 1.107 2001/09/04 19:03:23 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -20,12 +20,6 @@ static const char *RCSId="$Id: parser3.C
 #include "pa_socks.h"
 #include "pa_version.h"
 
-#ifdef WIN32
-#	define EOL "\r\n"
-#else
-#	define EOL "\n"
-#endif
-
 //#define DEBUG_POOL_MALLOC
 
 
@@ -93,8 +87,13 @@ void SAPI::log(Pool& pool, const char *f
 		fflush(f);
 }
 
+static char *_getenv(const char *name) {
+ 	char *result=getenv(name);
+	return result && *result ? result : 0;
+}
+
 const char *SAPI::get_env(Pool& pool, const char *name) {
- 	return getenv(name);
+	return _getenv(name);
 }
 
 size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) {
@@ -154,39 +153,39 @@ int main(int argc, char *argv[]) {
 
 	umask(2);
 
-#ifdef WIN32
-	setmode(fileno(stdin), _O_BINARY);
-	setmode(fileno(stdout), _O_BINARY);
-	setmode(fileno(stderr), _O_BINARY);
-#endif
-
 	// were we started as CGI?
 	cgi=
-		getenv("SERVER_SOFTWARE") || 
-		getenv("SERVER_NAME") || 
-		getenv("GATEWAY_INTERFACE") || 
-		getenv("REQUEST_METHOD");
+		_getenv("SERVER_SOFTWARE") || 
+		_getenv("SERVER_NAME") || 
+		_getenv("GATEWAY_INTERFACE") || 
+		_getenv("REQUEST_METHOD");
 	
 	if(!cgi) {
 		if(argc<2) {
 			printf(
-				"Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)"EOL
-				"Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)"EOL
-				EOL
-				"Usage: %s <file>"EOL,
+				"Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)\n"
+				"Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)\n"
+				"\n"
+				"Usage: %s <file>\n",
 				PARSER_VERSION, 
 				argv0?argv0:"parser3");
 			return 1;
 		}
 	}
 
-	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+#ifdef WIN32
+	setmode(fileno(stdin), _O_BINARY);
+	setmode(fileno(stdout), _O_BINARY);
+	setmode(fileno(stderr), _O_BINARY);
+#endif
+
+	char *filespec_to_process=cgi?_getenv("PATH_TRANSLATED"):argv[1];
 #ifdef WIN32
 	back_slashes_to_slashes(filespec_to_process);
 #endif
 	filespec_to_process=full_file_spec(filespec_to_process);
 
-	const char *request_method=getenv("REQUEST_METHOD");
+	const char *request_method=_getenv("REQUEST_METHOD");
 	bool header_only=request_method && strcasecmp(request_method, "HEAD")==0;
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
@@ -231,7 +230,7 @@ int main(int argc, char *argv[]) {
 				request_info.document_root="";
 		}
 		request_info.path_translated=filespec_to_process;
-		request_info.method=request_method;
+		request_info.method=request_method ? request_method : "GET";
 		const char *query_string=SAPI::get_env(pool, "QUERY_STRING");
 		request_info.query_string=query_string;
 		if(cgi) {
@@ -278,13 +277,16 @@ int main(int argc, char *argv[]) {
 			);
 		
 		// some root-controlled location
-#ifdef WIN32
+#ifdef SYSCONFDIR
+		const char *root_auto_path=SYSCONFDIR;
+#else
+#	ifdef WIN32
 		// c:\windows
 		static char root_auto_path[MAX_STRING];
 		GetWindowsDirectory(root_auto_path, MAX_STRING);
-#else
-		// ~nobody  todo: figure out a better place
-		const char *root_auto_path=SAPI::get_env(pool, "HOME");
+#	else
+		#error must be compiled either configure/make or MSVC++
+#	endif
 #endif
 		
 		// beside by binary
@@ -315,9 +317,12 @@ int main(int argc, char *argv[]) {
 #ifdef WIN32
 		SetUnhandledExceptionFilter(0);
 #endif
+
+#ifndef WIN32
 		// 
 		if(!cgi)
-			SAPI::send_body(pool, EOL, strlen(EOL));
+			SAPI::send_body(pool, "\n", 1);
+#endif
 
 		// successful finish
 		return 0;
@@ -350,9 +355,11 @@ int main(int argc, char *argv[]) {
 		if(!header_only)
 			SAPI::send_body(pool, body, content_length);
 
+#ifndef WIN32
 		// 
 		if(!cgi)
-			SAPI::send_body(pool, EOL, strlen(EOL));
+			SAPI::send_body(pool, "\n", 1);
+#endif
 
 		// unsuccessful finish
 		return 1;