--- parser3/src/include/pa_http.h	2008/06/11 11:38:18	1.2
+++ parser3/src/include/pa_http.h	2015/10/26 01:21:56	1.14
@@ -1,37 +1,24 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 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
 
-static const char * const IDENT_HTTP_H="$Date: 2008/06/11 11:38:18 $";
+#define IDENT_PA_HTTP_H "$Id: pa_http.h,v 1.14 2015/10/26 01:21:56 moko Exp $"
 
 #include "pa_vstring.h"
 #include "pa_vint.h"
 #include "pa_vhash.h"
 #include "pa_vtable.h"
 #include "pa_socks.h"
+#include "pa_request.h"
 
-#ifdef CYGWIN
-#define _GNU_H_WINDOWS32_SOCKETS
-// for PASCAL
-#include <windows.h>
-// SOCKET
-typedef u_int	SOCKET;
-int PASCAL closesocket(SOCKET);
-#else
-#	if defined(WIN32)
-#		include <windows.h>
-#	else
-#		define closesocket close
-#	endif
-#endif
+#define HTTP_COOKIES_NAME "cookies"
 
-const char* pa_form2string(HashStringValue& form);
 #ifndef DOXYGEN
 struct File_read_http_result {
 	char *str; size_t length;
@@ -39,9 +26,13 @@ struct File_read_http_result {
 }; 
 #endif
 
-File_read_http_result pa_internal_file_read_http(Request_charsets& charsets, 
-					    const String& file_spec, 
-					    bool as_text,
+Table* parse_cookies(Request& r, Table *cookies);
+
+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);