--- parser3/src/include/pa_common.h	2009/09/03 11:08:28	1.136
+++ parser3/src/include/pa_common.h	2010/05/17 22:54:58	1.142
@@ -8,7 +8,7 @@
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-static const char * const IDENT_COMMON_H="$Date: 2009/09/03 11:08:28 $";
+static const char * const IDENT_COMMON_H="$Date: 2010/05/17 22:54:58 $";
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -17,19 +17,26 @@ 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"
@@ -198,10 +205,13 @@ 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 
@@ -242,7 +252,7 @@ const char* format(double value, char *f
 
 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*/);
 
 #ifdef WIN32
 void back_slashes_to_slashes(char *s);
@@ -264,9 +274,7 @@ int getMonthDays(int year, int month);
 
 int remove_crlf(char *start, char *end);
 
-#ifdef PA_SAFE_MODE 
 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);
 char* pa_base64_encode(const char *in, size_t in_size);