--- parser3/src/targets/cgi/parser3.C	2021/11/30 16:18:26	1.345
+++ parser3/src/targets/cgi/parser3.C	2022/09/21 13:20:56	1.348
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.345 2021/11/30 16:18:26 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.348 2022/09/21 13:20:56 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -50,7 +50,7 @@ static const char* filespec_to_process =
 static const char* httpd_host_port = 0; // -p option
 static const char* config_filespec = 0; // -f option or from env or next to the executable if exists
 static bool mail_received = false; // -m option? [asked to parse incoming message to $mail:received]
-static char* parser3_filespec = 0; // argv[0]
+static const char* parser3_filespec = 0; // argv[0]
 static char** argv_extra = NULL;
 
 // for error logging
@@ -378,7 +378,7 @@ static void *connection_thread(void *arg
 static void httpd_mode() {
 	config_handler(*sapiInfo);
 
-	int sock = HTTPD_Server::bind(httpd_host_port);
+	SOCKET sock = HTTPD_Server::bind(httpd_host_port);
 
 #ifdef SIGPIPE
 	signal(SIGPIPE, SIG_IGN);
@@ -400,7 +400,7 @@ static void httpd_mode() {
 #ifdef _MSC_VER
 					if (!GC_CreateThread(0, 0, connection_thread, new HTTPD_Connection(connection), 0, 0))
 						throw Exception("httpd.fork", 0, "thread creation failed");
-					connection.sock = -1;
+					connection.sock=INVALID_SOCKET;
 					break;
 #else
 #ifdef HAVE_TLS
@@ -411,7 +411,7 @@ static void httpd_mode() {
 
 					if(int result=GC_pthread_create(&thread, &attr, connection_thread, new HTTPD_Connection(connection)))
 						throw Exception("httpd.fork", 0, "thread creation failed (%d)", result);
-					connection.sock=-1;
+					connection.sock=INVALID_SOCKET;
 					break;
 #endif
 				case HTTPD_Server::PARALLEL:
@@ -514,7 +514,7 @@ static void real_parser_handler(bool cgi
 	}
 	
 	request_info.content_type = getenv("CONTENT_TYPE");
-	request_info.content_length = (size_t)pa_atoul(getenv("CONTENT_LENGTH"));
+	request_info.content_length = cgi ? (size_t)pa_atoul(getenv("CONTENT_LENGTH")) : 0; // only SAPI_Info_CGI can read POST
 	request_info.cookie = getenv("HTTP_COOKIE");
 	request_info.mail_received = mail_received;
 
@@ -599,7 +599,7 @@ int main(int argc, char *argv[]) {
 	log("main: entry");
 #endif
 
-	parser3_filespec = argv[0];
+	parser3_filespec = argc ? argv[0] : "parser3";
 	umask(2);
 
 	// were we started as CGI?
@@ -625,7 +625,7 @@ int main(int argc, char *argv[]) {
 				char c = carg[k];
 				switch (c) {
 					case 'h':
-						usage(argv[0]);
+						usage(parser3_filespec);
 						break;
 					case 'f':
 						if(optind < argc - 1){
@@ -645,8 +645,8 @@ int main(int argc, char *argv[]) {
 						break;
 #endif
 					default:
-						fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c);
-						usage(argv[0]);
+						fprintf(stderr, "%s: invalid option '%c'\n", parser3_filespec, c);
+						usage(parser3_filespec);
 						break;
 				}
 			}
@@ -655,16 +655,16 @@ int main(int argc, char *argv[]) {
 		
 		if (optind > argc - 1) {
 			if(!httpd_host_port) {
-				fprintf(stderr, "%s: file not specified\n", argv[0]);
-				usage(argv[0]);
+				fprintf(stderr, "%s: file not specified\n", parser3_filespec);
+				usage(parser3_filespec);
 			}
 		} else {
 			raw_filespec_to_process=argv[optind];
 		}
 
 		if (httpd_host_port && mail_received) {
-				fprintf(stderr, "%s: -p and -m options should not be used together\n", argv[0]);
-				usage(argv[0]);
+				fprintf(stderr, "%s: -p and -m options should not be used together\n", parser3_filespec);
+				usage(parser3_filespec);
 		}
 
 		argv_extra=argv + optind;