--- parser3/src/include/pa_http.h	2016/09/01 13:57:04	1.16
+++ parser3/src/include/pa_http.h	2020/10/10 09:05:42	1.21
@@ -1,14 +1,14 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_HTTP_H
 #define PA_HTTP_H
 
-#define IDENT_PA_HTTP_H "$Id: pa_http.h,v 1.16 2016/09/01 13:57:04 moko Exp $"
+#define IDENT_PA_HTTP_H "$Id: pa_http.h,v 1.21 2020/10/10 09:05:42 moko Exp $"
 
 #include "pa_vstring.h"
 #include "pa_vint.h"
@@ -27,7 +27,7 @@ struct File_read_http_result {
 }; 
 #endif
 
-class ResponseHeaders {
+class HTTP_Headers {
 public:
 	class Header {
 	public:
@@ -46,25 +46,22 @@ public:
 	Array<Header> headers;
 
 	String::Body content_type;
+	uint64_t content_length;
 
-	bool add_header(const char *line){
-		const char *value=strchr(line, ':');
+	HTTP_Headers() : content_type(""), content_length(0){}
 
-		if(value && value != line){ // we need only headers, not the response code
-			Header header(str_upper(line, value-line), String::Body(value+1).trim(String::TRIM_BOTH, " \t\n\r"));
+	bool add_header(const char *line);
 
-			if(header.name == String::Body(HTTP_CONTENT_TYPE_UPPER) && content_type.is_empty())
-				content_type=header.value;
-
-			headers+=header;
-
-			return true;
-		}
-		return false;
+	void clear(){
+		headers.clear();
+		content_type="";
+		content_length=0;
 	}
 
 };
 
+/*** http part ***/
+
 Table* parse_cookies(Request& r, Table *cookies);
 void tables_update(HashStringValue& tables, const String::Body name, const String& value);
 
@@ -72,4 +69,34 @@ char *pa_http_safe_header_name(const cha
 
 File_read_http_result pa_internal_file_read_http(Request& r, const String& file_spec, bool as_text, HashStringValue *options=0, bool transcode_text_result=true);
 
+/*** httpd part ***/
+
+class HTTPD_request;
+
+class HTTPD_Connection : public PA_Allocated {
+public:
+	int sock;
+	const char *remote_addr;
+	HTTPD_request *request;
+
+	HTTPD_Connection(int asock, const char *addr) : sock(asock), remote_addr(addr), request(NULL){};
+
+	Array<HTTP_Headers::Header> &headers();
+
+	const char *method();
+	const char *uri();
+	const char *content_type();
+	uint64_t content_length();
+
+	void read_header();
+	size_t read_post(char *, size_t);
+	size_t send_body(const void *buf, size_t size);
+};
+
+class HTTPD_Server : public PA_Allocated {
+public:
+	static int bind(const char *host, int port);
+	static HTTPD_Connection *accept(int sock, int timeout_value);
+};
+
 #endif