--- parser3/src/include/pa_common.h	2013/10/14 19:45:13	1.154
+++ parser3/src/include/pa_common.h	2016/07/29 13:30:41	1.166
@@ -1,14 +1,14 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (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_COMMON_H
 #define PA_COMMON_H
 
-#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.154 2013/10/14 19:45:13 moko Exp $"
+#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.166 2016/07/29 13:30:41 moko Exp $"
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -16,43 +16,33 @@
 class Request;
 
 // defines
-#define HTTP_USER_AGENT	"user-agent"
-
-#define HTTP_STATUS	"status"
+#define HTTP_STATUS		"status"
 #define HTTP_STATUS_CAPITALIZED	"Status"
 
-#define HTTP_CONTENT_LENGTH	"content-length"
+#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		"content-type"
+#define HTTP_CONTENT_TYPE_UPPER		"CONTENT-TYPE"
 #define HTTP_CONTENT_TYPE_CAPITALIZED	"Content-Type"
+
+#define CONTENT_DISPOSITION		"content-disposition"
+#define CONTENT_DISPOSITION_UPPER	"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 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-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);
-
-const String content_disposition(CONTENT_DISPOSITION);
-const String content_disposition_inline(CONTENT_DISPOSITION_INLINE);
-const String content_disposition_attachment(CONTENT_DISPOSITION_ATTACHMENT);
 const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
 
-
 #define HASH_ORDER
 
 #ifdef HASH_ORDER
@@ -83,6 +73,10 @@ int __snprintf(char *, size_t, const cha
 #	define strcasecmp _stricmp
 #endif
 
+#ifndef strncasecmp
+#	define strncasecmp _strnicmp
+#endif
+
 #endif
 
 /** 
@@ -100,11 +94,7 @@ void create_dir_for_file(const String& f
 
 int pa_get_valid_file_options_count(HashStringValue& options);
 
-typedef void (*File_read_action)(
-				struct stat& finfo,
-				int f, 
-				const String& file_spec, const char* fname, bool as_text,
-				void *context);
+typedef void (*File_read_action)(struct stat& finfo, int f, const String& file_spec, void *context);
 
 /**
 	shared-lock specified file, 
@@ -213,12 +203,7 @@ bool dir_exists(const String& file_spec)
 const String* file_exist(const String& path, const String& name);
 bool file_executable(const String& file_spec);
 
-bool file_stat(const String& file_spec, 
-				size_t& rsize, 
-				time_t& ratime,
-				time_t& rmtime,
-				time_t& rctime,
-				bool fail_on_read_problem=true);
+bool file_stat(const String& file_spec, size_t& rsize, time_t& ratime, time_t& rmtime, time_t& rctime, bool fail_on_read_problem=true);
 
 size_t stdout_write(const void *buf, size_t size);
 
@@ -230,8 +215,6 @@ int file_block_read(const int f, unsigne
 	String related functions
 */
 
-const char* capitalize(const char* s);
-
 /** under WIN32 "t" mode fixes DOS chars OK, 
 	can't say that about other systems/ line break styles
 */
@@ -241,35 +224,42 @@ 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, const char *fmt);
 
 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);
 
+inline int pa_strncasecmp(const char* str, const char* substr, size_t count=0) {
+	return strncasecmp(str, substr, count ? count : strlen(substr));
+}
+
 #ifdef WIN32
 void back_slashes_to_slashes(char *s);
 #endif
 
-bool StrStartFromNC(const char* str, const char* substr, bool equal=false);
 size_t strpos(const char *str, const char *substr);
 
 int remove_crlf(char *start, char *end);
 
-inline bool pa_isalpha(unsigned char c) {
-	return (((c>='A') && (c<='Z')) || ((c>='a') && (c<='z')));
-}
+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)); }
 
-inline bool pa_isalnum(unsigned char c) {
-	return (((c>='0') && (c<='9')) || pa_isalpha(c));
-}
+const char* capitalize(const char* s);
+char *str_lower(const char *s, size_t helper_length=0);
+char *str_upper(const char *s, size_t helper_length=0);
 
 const char* hex_string(unsigned char* bytes, size_t size, bool upcase);
+extern const char* hex_digits;
 
 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);
 char* pa_base64_encode(const String& file_spec);
 
+const char *pa_idna_encode(const char *in, Charset &source);
+const char *pa_idna_decode(const char *in, Charset &source);
+
 const unsigned long pa_crc32(const char *in, size_t in_size);
 const unsigned long pa_crc32(const String& file_spec);
 
@@ -277,29 +267,19 @@ const unsigned long pa_crc32(const Strin
 	Mix functions
 */
 
+#define PA_DEFAULT(A,B) ((A) ? (A):(B) )
+
 // some stuff for use with .for_each
-static void copy_all_overwrite_to(
-								HashStringValue::key_type key, 
-								HashStringValue::value_type value, 
-								HashStringValue* dest) {
+static void copy_all_overwrite_to(HashStringValue::key_type key, HashStringValue::value_type value, HashStringValue* dest) {
 	dest->put(key, value);
 }
 
-static void remove_key_from(
-							HashStringValue::key_type key, 
-							HashStringValue::value_type /*value*/, 
-							HashStringValue* dest) {
+static void remove_key_from(HashStringValue::key_type key, HashStringValue::value_type /*value*/, HashStringValue* dest) {
 	dest->remove(key);
 }
 
 Charset* detect_charset(const char* content_type);
 
-#define SECS_PER_DAY (60*60*24)
-
-int getMonthDays(int year, int month);
-
-String::C date_gmt_string(tm* tms);
-
 // globals
 
 extern const String file_status_name;
@@ -322,7 +302,7 @@ extern const String file_status_name;
 
 #ifndef DOXYGEN
 enum Table2hash_distint { D_ILLEGAL, D_FIRST };
-enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE };
+enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE, C_CODE };
 #endif
 
 #endif