--- parser3/src/include/pa_common.h	2009/09/03 11:08:28	1.136
+++ parser3/src/include/pa_common.h	2013/07/23 07:51:30	1.152
@@ -1,14 +1,14 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-static const char * const IDENT_COMMON_H="$Date: 2009/09/03 11:08:28 $";
+#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.152 2013/07/23 07:51:30 moko Exp $"
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -17,23 +17,32 @@ class Request;
 
 // defines
 #define HTTP_USER_AGENT	"user-agent"
+
 #define HTTP_STATUS	"status"
+#define HTTP_STATUS_CAPITALIZED	"Status"
+
 #define HTTP_CONTENT_LENGTH	"content-length"
+#define HTTP_CONTENT_LENGTH_CAPITALIZED	"Content-Length"
 
 #define HTTP_CONTENT_TYPE	"content-type"
 #define HTTP_CONTENT_TYPE_UPPER	"CONTENT-TYPE"
+#define HTTP_CONTENT_TYPE_CAPITALIZED	"Content-Type"
 #define HTTP_CONTENT_TYPE_FORM_URLENCODED	"application/x-www-form-urlencoded"
 #define HTTP_CONTENT_TYPE_MULTIPART_FORMDATA	"multipart/form-data"
 #define HTTP_CONTENT_TYPE_MULTIPART_RELATED	"multipart/related"
 #define HTTP_CONTENT_TYPE_MULTIPART_MIXED	"multipart/mixed"
 
-#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-tncoding"
+#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding"
+#define CONTENT_TRANSFER_ENCODING_CAPITALIZED "Content-Transfer-Encoding"
 
 #define CONTENT_DISPOSITION	"content-disposition"
+#define CONTENT_DISPOSITION_CAPITALIZED	"Content-Disposition"
 #define CONTENT_DISPOSITION_ATTACHMENT "attachment"
 #define CONTENT_DISPOSITION_INLINE "inline"
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
 
+#define BASE64_STRICT_OPTION_NAME "strict"
+
 const String http_content_type(HTTP_CONTENT_TYPE);
 
 const String content_transfer_encoding_name(CONTENT_TRANSFER_ENCODING_NAME);
@@ -198,21 +207,24 @@ bool file_write_action_under_lock(
 	throws an exception in case of problems
 */
 void file_write(
+				Request_charsets& charsets,
 				const String& file_spec,
-				const char* data, size_t size, 
+				const char* data,
+				size_t size, 
 				bool as_text,
-				bool do_append=false);
+				bool do_append=false,
+				Charset* asked_charset=0);
 
 /**
 	delete specified file 
 	throws an exception in case of problems
 */
-bool file_delete(const String& file_spec, bool fail_on_problem=true);
+bool file_delete(const String& file_spec, bool fail_on_problem=true, bool keep_empty_dirs=false);
 /**
 	move specified file 
 	throws an exception in case of problems
 */
-void file_move(const String& old_spec, const String& new_spec);
+void file_move(const String& old_spec, const String& new_spec, bool keep_empty_dirs=false);
 
 bool entry_exists(const char* fname, struct stat *afinfo=0);
 bool entry_exists(const String& file_spec);
@@ -238,20 +250,20 @@ char *getrow(char **row_ref,char delim='
 char *lsplit(char *string, char delim);
 char *lsplit(char **string_ref,char delim);
 char *rsplit(char *string, char delim);
-const char* format(double value, char *fmt);
+const char* format(double value, const char *fmt);
 
 size_t stdout_write(const void *buf, size_t size);
 
-char* unescape_chars(const char* cp, int len, Charset* client_charset=0, bool ignore_plus=false);
+char* unescape_chars(const char* cp, int len, Charset* client_charset=0, bool js=false/*true==decode \uXXXX and don't convert '+' to space*/);
+
+char *search_stop(char*& current, char cstop_at);
 
 #ifdef WIN32
 void back_slashes_to_slashes(char *s);
-//void slashes_to_back_slashes(char *s);
 #endif
 
 #ifndef _qsort
-#	define _qsort(names,cnt,sizeof_names,func_addr) \
-		qsort(names,cnt,sizeof_names,func_addr)
+#define _qsort(names,cnt,sizeof_names,func_addr) qsort(names,cnt,sizeof_names,func_addr)
 #endif
 
 bool StrStartFromNC(const char* str, const char* substr, bool equal=false);
@@ -264,11 +276,17 @@ int getMonthDays(int year, int month);
 
 int remove_crlf(char *start, char *end);
 
-#ifdef PA_SAFE_MODE 
+inline bool pa_isalpha(unsigned char c) {
+	return (((c>='A') && (c<='Z')) || ((c>='a') && (c<='z')));
+}
+
+inline bool pa_isalnum(unsigned char c) {
+	return (((c>='0') && (c<='9')) || pa_isalpha(c));
+}
+
 void check_safe_mode(struct stat finfo, const String& file_spec, const char* fname); 
-#endif 
 
-void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size);
+void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size, bool strict=false);
 char* pa_base64_encode(const char *in, size_t in_size);
 struct File_base64_action_info {
 	unsigned char** base64;
@@ -368,7 +386,6 @@ static String::C date_gmt_string(tm* tms
 		tms->tm_hour,tms->tm_min,tms->tm_sec));
 }
 
-
 // globals
 
 extern const String file_status_name;
@@ -380,6 +397,7 @@ extern const String file_status_name;
 #define PA_COLUMN_SEPARATOR_NAME "separator"
 #define PA_COLUMN_ENCLOSER_NAME "encloser"
 #define PA_CHARSET_NAME "charset"
+#define PA_RESPONSE_CHARSET_NAME "response-charset"
 
 // globals defines for sql options