--- parser3/src/main/pa_http.C	2020/11/12 16:26:19	1.101
+++ parser3/src/main/pa_http.C	2020/12/20 20:27:19	1.116
@@ -1,7 +1,7 @@
 /** @file
 	Parser: http support functions.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
  */
 
@@ -14,7 +14,7 @@
 #include "pa_vfile.h"
 #include "pa_random.h"
 
-volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.101 2020/11/12 16:26:19 moko Exp $" IDENT_PA_HTTP_H; 
+volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.116 2020/12/20 20:27:19 moko Exp $" IDENT_PA_HTTP_H; 
 
 #ifdef _MSC_VER
 #include <windows.h>
@@ -114,14 +114,14 @@ public:
 	}
 
 	bool read(int sock, size_t size){
-		if(length+size>buf_size)
-			resize(buf_size*2 + size);
+		if(length + size > buf_size)
+			resize(buf_size * 2 + size);
 		ssize_t received_size=recv(sock, buf + length, size, 0);
-		if(received_size==0)
+		if(received_size == 0)
 			return false;
-		if(received_size<0) {
-			if(int no=pa_socks_errno())
-				throw Exception("http.timeout", 0, "error receiving response body: %s (%d)", pa_socks_strerr(no), no);
+		if(received_size < 0) {
+			if(int no = pa_socks_errno())
+				throw Exception("http.timeout", 0, "error receiving response: %s (%d)", pa_socks_strerr(no), no);
 			return false;
 		}
 		length+=received_size;
@@ -913,6 +913,13 @@ File_read_http_result pa_internal_file_r
 
 /* ********************** httpd *************************** */
 
+#ifdef HTTPD_DEBUG
+void pa_log(const char* fmt, ...);
+#define LOG(action) action
+#else
+#define LOG(action)
+#endif
+
 enum EscapeState {
         Initial,
         Default,
@@ -953,7 +960,7 @@ static bool check_uri(const char *uri){
 			case EscapeSecond:
 				if(isxdigit(c)){
 					state=Default;
-					c=escapedValue + hex_value[c];
+					c=(uchar)(escapedValue + hex_value[c]);
 
 					// implementing Apache AllowEncodedSlashes Off just in case
 					if(c=='/' || c=='\\')
@@ -981,6 +988,24 @@ public:
 
 	HTTPD_request() : HTTP_response(), method(NULL), uri(NULL){};
 
+	ssize_t pa_recv(int sockfd, char *buf, size_t len);
+
+	bool read(int sock, size_t size){
+		if(length + size > buf_size)
+			resize(buf_size * 2 + size);
+		ssize_t received_size=pa_recv(sock, buf + length, size);
+		if(received_size == 0)
+			return false;
+		if(received_size < 0) {
+			if(int no = pa_socks_errno())
+				throw Exception("httpd.read", 0, "error receiving request: %s (%d)", pa_socks_strerr(no), no);
+			return false;
+		}
+		length+=received_size;
+		buf[length]='\0';
+		return true;
+	}
+
 	const char *extract_method(char *method_line){
 		char* uri_start = strchr(method_line, ' ');
 
@@ -999,7 +1024,8 @@ public:
 		return str_upper(method_line, uri_start-method_line);
 	}
 
-	void read_header(int);
+
+	bool read_header(int);
 	size_t read_post(int, char *, size_t);
 };
 
@@ -1008,7 +1034,48 @@ enum HTTPD_request_state {
 	HTTPD_HEADERS
 };
 
-void HTTPD_request::read_header(int sock) {
+ssize_t HTTPD_request::pa_recv(int sockfd, char *buffer, size_t len){
+	LOG(pa_log("httpd [%d] recv %d appending to %d ...", sockfd, len, length));
+	if(HTTPD_Server::mode == HTTPD_Server::MULTITHREADED){
+		ssize_t result=recv(sockfd, buffer, len, 0);
+		LOG(pa_log("httpd [%d] recv got %d bytes", sockfd, result));
+		return result;
+	}
+
+#ifdef PA_USE_ALARM
+	signal(SIGALRM, timeout_handler);
+	if(sigsetjmp(timeout_env, 1)) {
+		LOG(pa_log("httpd [%d] recv got %d sec timeout", sockfd, pa_httpd_timeout));
+		if(length) // timeout on "void" connection is normal
+			throw Exception("httpd.timeout", 0, "timeout occurred while receiving request");
+		return 0;
+	} else
+#endif
+	{
+		ALARM(pa_httpd_timeout);
+		ssize_t result=recv(sockfd, buffer, len, 0);
+		ALARM(0);
+		LOG(pa_log("httpd [%d] recv got %d bytes", sockfd, result));
+		LOG(pa_log("httpd [%d] %s", sockfd, buffer));
+		return result;
+	}
+}
+
+static bool valid_http_method(const char * method){
+	return method && (
+		!strcmp(method, "GET") ||
+		!strcmp(method, "HEAD") ||
+		!strcmp(method, "POST") ||
+		!strcmp(method, "PUT") ||
+		!strcmp(method, "DELETE") ||
+		!strcmp(method, "CONNECT") ||
+		!strcmp(method, "OPTIONS") ||
+		!strcmp(method, "TRACE") ||
+		!strcmp(method, "PATCH")
+	);
+}
+
+bool HTTPD_request::read_header(int sock) {
 	enum HTTPD_request_state state = HTTPD_METHOD;
 
 	size_t chunk_size = 0x400*4;
@@ -1024,14 +1091,7 @@ void HTTPD_request::read_header(int sock
 				char *method_line = pa_strdup(buf, method_size);
 				method = extract_method(method_line);
 
-				if(!method ||
-					strcmp(method, "GET") &&
-					strcmp(method, "HEAD") &&
-					strcmp(method, "POST") &&
-					strcmp(method, "PUT") &&
-					strcmp(method, "DELETE") &&
-					strcmp(method, "PATCH")
-				)
+				if(!valid_http_method(method))
 					throw Exception("httpd.method", new String(method ? method : method_line), "invalid request method");
 				state = HTTPD_HEADERS;
 			}
@@ -1041,11 +1101,16 @@ void HTTPD_request::read_header(int sock
 					break;
 
 				parse_headers();
-				return;
+				return true;
 			}
 		}
 	}
 
+	if(!length){ // browsers open connections in advance and they will be empty unless user requests more pages
+		LOG(pa_log("httpd [%d] void request", sock));
+		return false;
+	}
+
 	if(state == HTTPD_METHOD)
 		throw Exception("httpd.request", 0, "bad request from host - no method found (size=%u)", length);
 
@@ -1053,6 +1118,8 @@ void HTTPD_request::read_header(int sock
 		parse_headers();
 		body_offset=length;
 	}
+
+	return true;
 }
 
 size_t HTTPD_request::read_post(int sock, char *body, size_t max_bytes) {
@@ -1060,12 +1127,12 @@ size_t HTTPD_request::read_post(int sock
 	memcpy(body, buf + body_offset, total_read);
 
 	while (total_read < max_bytes){
-		ssize_t received_size = recv(sock, body + total_read, max_bytes - total_read, 0);
+		ssize_t received_size = pa_recv(sock, body + total_read, max_bytes - total_read);
 		if(received_size == 0)
 			return total_read;
 		if(received_size < 0) {
 			if(int no = pa_socks_errno())
-				throw Exception("httpd.timeout", new String(uri), "error receiving request body: %s (%d)", pa_socks_strerr(no), no);
+				throw Exception("httpd.read", new String(uri), "error receiving request body: %s (%d)", pa_socks_strerr(no), no);
 			return total_read;
 		}
 		total_read += received_size;
@@ -1095,9 +1162,13 @@ uint64_t HTTPD_Connection::content_lengt
 	return request->headers.content_length;
 }
 
-void HTTPD_Connection::read_header(){
+bool HTTPD_Connection::read_header(){
 	request = new HTTPD_request();
-	request->read_header(sock);
+	bool result = request->read_header(sock);
+	LOG(if(result){
+		pa_log("httpd [%d] got %s \"%s\"", sock, method(), uri());
+	})
+	return result;
 }
 
 size_t HTTPD_Connection::read_post(char *body, size_t max_bytes) {
@@ -1105,16 +1176,20 @@ size_t HTTPD_Connection::read_post(char
 }
 
 size_t HTTPD_Connection::send_body(const void *buf, size_t size) {
+	LOG(pa_log("httpd [%d] response %d bytes", sock, size));
+	LOG(pa_log("httpd [%d] %s", sock, buf));
 	if(send(sock, (const char*)buf, size, 0) != (ssize_t)size) {
 		int no=pa_socks_errno();
-		throw Exception("httpd.timeout", 0, "error sending response: %s (%d)", pa_socks_strerr(no), no);
+		throw Exception("httpd.write", 0, "error sending response: %s (%d)", pa_socks_strerr(no), no);
 	}
 	return size;
 }
 
 HTTPD_Connection::~HTTPD_Connection(){
-	if(sock != -1)
+	if(sock != -1){
+		LOG(pa_log("httpd [%d] closed", sock));
 		closesocket(sock);
+	}
 }
 
 static int sock_ready(int fd,int operation,int timeout_value){
@@ -1151,22 +1226,40 @@ bool HTTPD_Connection::accept(int server
 	}
 
 	remote_addr = pa_strdup(inet_ntoa(addr.sin_addr));
+	LOG(pa_log("httpd [%d] accepted from %s", sock, remote_addr));
 	return true;
 }
 
+HTTPD_Server::HTTPD_MODE HTTPD_Server::mode = HTTPD_Server::SEQUENTIAL;
+const char *HTTPD_Server::port=NULL;
+
+void HTTPD_Server::set_mode(const String &value){
+                if(value == "sequental") mode = SEQUENTIAL;
+#ifdef HAVE_TLS
+                else if (value == "threaded") mode = MULTITHREADED;
+#endif
+#ifdef _MSC_VER
+		else throw Exception("httpd.mode", &value, "$main:HTTPD.mode must be 'sequental' or 'threaded'");
+#else
+                else if (value == "parallel") mode = PARALLEL;
+		else throw Exception("httpd.mode", &value, "$main:HTTPD.mode must be 'sequental', 'parallel' or 'threaded'");
+#endif
+}
+
 int HTTPD_Server::bind(const char *host_port){
 	struct sockaddr_in me;
 
-	const char *port = strchr(host_port, ':');
+	port = strchr(host_port, ':');
 	const char *host = NULL;
-	if(port && port > host_port){
-		host = pa_strdup(host_port, port - host_port);
+	if(port){
+		if(port > host_port)
+			host = pa_strdup(host_port, port - host_port);
 		port += 1;
 	} else {
 		port = host_port;
 	}
 
-	if(!set_addr(&me, host, pa_atoui(port))){
+	if(!set_addr(&me, host, (short)pa_atoui(port))){
 		if (host)
 			throw Exception("httpd.bind", 0, "can not resolve hostname \"%s\"", host);
 		me.sin_addr.s_addr=INADDR_ANY;