--- parser3/src/include/pa_http.h	2012/06/20 20:54:25	1.8
+++ parser3/src/include/pa_http.h	2017/02/07 22:00:34	1.19
@@ -1,32 +1,24 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2012 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.8 2012/06/20 20:54:25 moko Exp $"
+#define IDENT_PA_HTTP_H "$Id: pa_http.h,v 1.19 2017/02/07 22:00:34 moko Exp $"
 
 #include "pa_vstring.h"
 #include "pa_vint.h"
 #include "pa_vhash.h"
 #include "pa_vtable.h"
 #include "pa_socks.h"
+#include "pa_charset.h"
+#include "pa_request.h"
 
-#ifdef WIN32
-#include <windows.h>
-
-#ifdef CYGWIN
-typedef u_int SOCKET;
-extern "C" int PASCAL FAR closesocket(SOCKET);
-#endif
-
-#else // WIN32
-#define closesocket close
-#endif
+#define HTTP_COOKIES_NAME "cookies"
 
 #ifndef DOXYGEN
 struct File_read_http_result {
@@ -35,12 +27,44 @@ struct File_read_http_result {
 }; 
 #endif
 
+class ResponseHeaders {
+public:
+	class Header {
+	public:
+		String::Body name;
+		String::Body value;
+
+		Header(String::Body aname, String::Body avalue) : name(aname), value(avalue) {}
+
+		void transcode(Charset &charset, Charset &source){
+			name=Charset::transcode(name, charset, source);
+			value=Charset::transcode(value, charset, source);
+		}
+
+	};
+
+	Array<Header> headers;
+
+	String::Body content_type;
+	uint64_t content_length;
+
+	ResponseHeaders() : content_type(""), content_length(0){}
+
+	bool add_header(const char *line);
+
+	void clear(){
+		headers.clear();
+		content_type="";
+		content_length=0;
+	}
+
+};
+
+Table* parse_cookies(Request& r, Table *cookies);
+void tables_update(HashStringValue& tables, const String::Body name, const String& value);
+
 char *pa_http_safe_header_name(const char *name);
 
-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);
+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);
 
 #endif