--- parser3/src/main/pa_common.C	2013/07/23 12:10:56	1.276
+++ parser3/src/main/pa_common.C	2015/01/12 12:22:02	1.280
@@ -41,7 +41,13 @@
 #include <direct.h>
 #endif
 
-volatile const char * IDENT_PA_COMMON_C="$Id: pa_common.C,v 1.276 2013/07/23 12:10:56 moko Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
+#ifdef _MSC_VER
+#define pa_mkdir(path, mode) _mkdir(path)
+#else
+#define pa_mkdir(path, mode) mkdir(path, mode)
+#endif
+
+volatile const char * IDENT_PA_COMMON_C="$Id: pa_common.C,v 1.280 2015/01/12 12:22:02 misha Exp $" IDENT_PA_COMMON_H IDENT_PA_HASH_H IDENT_PA_ARRAY_H IDENT_PA_STACK_H; 
 
 // some maybe-undefined constants
 
@@ -72,57 +78,6 @@ const String file_status_name(FILE_STATU
 
 // functions
 
-bool capitalized(const char* s){
-	bool upper=true;
-	for(const char* c=s; *c; c++){
-		if(*c != (upper ? toupper((unsigned char)*c) : tolower((unsigned char)*c)))
-			return false;
-		upper=strchr("-_ ", *c) != 0;
-	}
-	return true;
-}
-
-const char* capitalize(const char* s){
-	if(!s || capitalized(s))
-		return s;
-
-	char* result=pa_strdup(s);
-	if(result){
-		bool upper=true;
-		for(char* c=result; *c; c++){
-			*c=upper ? (char)toupper((unsigned char)*c) : (char)tolower((unsigned char)*c);
-			upper=strchr("-_ ", *c) != 0;
-		}
-	}
-	return (const char*)result;
-}
-
-void fix_line_breaks(char *str, size_t& length) {
-	//_asm int 3;
-	const char* const eob=str+length;
-	char* dest=str;
-	// fix DOS: \r\n -> \n
-	// fix Macintosh: \r -> \n
-	char* bol=str;
-	while(char* eol=(char*)memchr(bol, '\r', eob -bol)) {
-		size_t len=eol-bol;
-		if(dest!=bol)
-			memmove(dest, bol, len); 
-		dest+=len;
-		*dest++='\n'; 
-
-		if(&eol[1]<eob && eol[1]=='\n') { // \r, \n = DOS
-			bol=eol+2;
-			length--; 
-		} else // \r, not \n = Macintosh
-			bol=eol+1;
-	}
-	// last piece without \r
-	if(dest!=bol)
-		memmove(dest, bol, eob-bol); 
-	str[length]=0; // terminating
-}
-
 char* file_read_text(Request_charsets& charsets, const String& file_spec, bool fail_on_read_problem, HashStringValue* params, bool transcode_result) {
 	File_read_result file=file_read(charsets, file_spec, true, params, fail_on_read_problem, 0, 0, 0, transcode_result);
 	return file.success?file.str:0;
@@ -331,7 +286,7 @@ void create_dir_for_file(const String& f
 	size_t pos_after=1;
 	size_t pos_before;
 	while((pos_before=file_spec.pos('/', pos_after))!=STRING_NOT_FOUND) {
-		mkdir(file_spec.mid(0, pos_before).taint_cstr(String::L_FILE_SPEC), 0775); 
+		pa_mkdir(file_spec.mid(0, pos_before).taint_cstr(String::L_FILE_SPEC), 0775); 
 		pos_after=pos_before+1;
 	}
 }
@@ -478,7 +433,7 @@ static bool entry_readable(const String&
 }
 
 // throws nothing! [this is required in file_move & file_delete]
-static void rmdir(const String& file_spec, size_t pos_after=0) {
+static void rmdir(const String& file_spec, size_t pos_after) {
 	char* dir_spec=file_spec.taint_cstrm(String::L_FILE_SPEC);
 	size_t length=strlen(dir_spec);
 	while( (length=get_dir(dir_spec, length)) && (length > pos_after) ){
@@ -588,6 +543,68 @@ bool file_stat(const String& file_spec,
 	return true;
 }
 
+/** 
+	String related functions
+*/
+
+bool capitalized(const char* s){
+	bool upper=true;
+	for(const char* c=s; *c; c++){
+		if(*c != (upper ? toupper((unsigned char)*c) : tolower((unsigned char)*c)))
+			return false;
+		upper=strchr("-_ ", *c) != 0;
+	}
+	return true;
+}
+
+const char* capitalize(const char* s){
+	if(!s || capitalized(s))
+		return s;
+
+	char* result=pa_strdup(s);
+	if(result){
+		bool upper=true;
+		for(char* c=result; *c; c++){
+			*c=upper ? (char)toupper((unsigned char)*c) : (char)tolower((unsigned char)*c);
+			upper=strchr("-_ ", *c) != 0;
+		}
+	}
+	return (const char*)result;
+}
+
+void fix_line_breaks(char *str, size_t& length) {
+	//_asm int 3;
+	const char* const eob=str+length;
+	char* dest=str;
+	// fix DOS: \r\n -> \n
+	// fix Macintosh: \r -> \n
+	char* bol=str;
+	while(char* eol=(char*)memchr(bol, '\r', eob -bol)) {
+		size_t len=eol-bol;
+		if(dest!=bol)
+			memmove(dest, bol, len); 
+		dest+=len;
+		*dest++='\n'; 
+
+		if(&eol[1]<eob && eol[1]=='\n') { // \r, \n = DOS
+			bol=eol+2;
+			length--; 
+		} else // \r, not \n = Macintosh
+			bol=eol+1;
+	}
+	// last piece without \r
+	if(dest!=bol)
+		memmove(dest, bol, eob-bol); 
+	str[length]=0; // terminating
+}
+
+/**
+	scans for @a delim[default \n] in @a *row_ref, 
+	@return piece of line before it or end of string, if no @a delim found
+	assigns @a *row_ref to point right after delimiter if there were one
+	or to zero if no @a delim were found.
+*/
+
 char* getrow(char* *row_ref, char delim) {
 	char* result=*row_ref;
 	if(result) {
@@ -846,13 +863,10 @@ void back_slashes_to_slashes(char* s) {
 }
 #endif
 
-bool StrStartFromNC(const char* str, const char* substr, bool equal){
+bool StrStartFromNC(const char* str, const char* substr){
 	while(true) {
 		if(!(*substr)){
-			if(!(*str))
 				return true;
-			else
-				return !equal;
 		}
 		if(!(*str))
 			return false;
@@ -871,61 +885,6 @@ size_t strpos(const char *str, const cha
 	return (p==0)?STRING_NOT_FOUND:p-str;
 }
 
-// content-type: xxx; charset=WE-NEED-THIS
-// content-type: xxx; charset="WE-NEED-THIS"
-// content-type: xxx; charset="WE-NEED-THIS";
-Charset* detect_charset(const char* content_type){
-	if(content_type){
-		char* CONTENT_TYPE=pa_strdup(content_type);
-
-		for(char *p=CONTENT_TYPE; *p; p++)
-			*p=(char)toupper((unsigned char)*p);
-
-		if(const char* begin=strstr(CONTENT_TYPE, "CHARSET=")){
-			begin+=8; // skip "CHARSET="
-			char* end=0;
-			if(*begin && (*begin=='"' || *begin =='\'')){
-				char quote=*begin;
-				begin++;
-				end=(char*)strchr(begin, quote);
-			}
-			if(!end)
-				end=(char*)strchr(begin, ';');
-
-			if(end)
-				*end=0; // terminator
-
-			return *begin?&charsets.get(begin):0;
-		}
-	}
-	return 0;
-}
-
-
-static bool isLeap(int year) {
-	return !(
-				(year % 4) || ((year % 400) && !(year % 100))
-			); 
-}
-
-int getMonthDays(int year, int month) {
-	static int monthDays[]={
-		31, 
-		28, 
-		31, 
-		30, 
-		31, 
-		30, 
-		31, 
-		31, 
-		30, 
-		31, 
-		30, 
-		31
-	}; 
-	return (month == 1 /* january -- 0 */ && isLeap(year)) ? 29 : monthDays[month]; 
-}
-
 int remove_crlf(char* start, char* end) {
 	char* from=start;
 	char* to=start;
@@ -953,6 +912,24 @@ int remove_crlf(char* start, char* end)
 	return to-start;
 }
 
+const char* hex_digits="0123456789ABCDEF";
+
+const char* hex_string(unsigned char* bytes, size_t size, bool upcase) {
+	char *bytes_hex=new(PointerFreeGC) char [size*2/*byte->hh*/+1/*for zero-teminator*/];
+	unsigned char *src=bytes;
+	unsigned char *end=bytes+size;
+	char *dest=bytes_hex;
+
+	const char *hex=upcase? hex_digits : "0123456789abcdef";
+
+	for(; src<end; src++) {
+		*dest++=hex[*src/0x10];
+		*dest++=hex[*src%0x10];
+	}
+	*dest=0;
+
+	return bytes_hex;
+}
 
 /// must be last in this file
 #undef vsnprintf
@@ -1278,17 +1255,9 @@ char* pa_base64_encode(const char *in, s
 	return result;
 }
 
-
-char* pa_base64_encode(const String& file_spec){
-	unsigned char* base64=0;
-	File_base64_action_info info={&base64}; 
-
-	file_read_action_under_lock(file_spec, 
-		"pa_base64_encode", file_base64_file_action, &info);
-
-	return (char*)base64; 
-}
-
+struct File_base64_action_info {
+	unsigned char** base64;
+}; 
 
 static void file_base64_file_action(
 				struct stat& finfo, 
@@ -1315,6 +1284,16 @@ static void file_base64_file_action(
 	}
 }
 
+char* pa_base64_encode(const String& file_spec){
+	unsigned char* base64=0;
+	File_base64_action_info info={&base64}; 
+
+	file_read_action_under_lock(file_spec, 
+		"pa_base64_encode", file_base64_file_action, &info);
+
+	return (char*)base64; 
+}
+
 void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size, bool strict) {
 	// every 4 base64 bytes are converted into 3 normal bytes
 	// not full set (tail) of 4-bytes set is ignored
@@ -1343,6 +1322,35 @@ int file_block_read(const int f, unsigne
 	return nCount;
 }
 
+static unsigned long crc32Table[256];
+static void InitCrc32Table()
+{
+	if(crc32Table[1] == 0){
+		// This is the official polynomial used by CRC32 in PKZip.
+		// Often times the polynomial shown reversed as 0x04C11DB7.
+		static const unsigned long dwPolynomial = 0xEDB88320;
+
+		for(int i = 0; i < 256; i++)
+		{
+			unsigned long dwCrc = i;
+			for(int j = 8; j > 0; j--)
+			{
+				if(dwCrc & 1)
+					dwCrc = (dwCrc >> 1) ^ dwPolynomial;
+				else
+					dwCrc >>= 1;
+			}
+			crc32Table[i] = dwCrc;
+		}
+	}
+}
+
+inline void CalcCrc32(const unsigned char byte, unsigned long &crc32)
+{
+	crc32 = ((crc32) >> 8) ^ crc32Table[(byte) ^ ((crc32) & 0x000000FF)];
+}
+
+
 const unsigned long pa_crc32(const char *in, size_t in_size){
 	unsigned long crc32=0xFFFFFFFF;
 
@@ -1353,12 +1361,6 @@ const unsigned long pa_crc32(const char
 	return ~crc32; 
 }
 
-const unsigned long pa_crc32(const String& file_spec){
-	unsigned long crc32=0xFFFFFFFF;
-	file_read_action_under_lock(file_spec, "crc32", file_crc32_file_action, &crc32);
-	return ~crc32; 
-}
-
 static void file_crc32_file_action(
 				struct stat& finfo, 
 				int f, 
@@ -1376,3 +1378,78 @@ static void file_crc32_file_action(
 	}
 }
 
+const unsigned long pa_crc32(const String& file_spec){
+	unsigned long crc32=0xFFFFFFFF;
+	file_read_action_under_lock(file_spec, "crc32", file_crc32_file_action, &crc32);
+	return ~crc32; 
+}
+
+// content-type: xxx; charset=WE-NEED-THIS
+// content-type: xxx; charset="WE-NEED-THIS"
+// content-type: xxx; charset="WE-NEED-THIS";
+Charset* detect_charset(const char* content_type){
+	if(content_type){
+		char* CONTENT_TYPE=pa_strdup(content_type);
+
+		for(char *p=CONTENT_TYPE; *p; p++)
+			*p=(char)toupper((unsigned char)*p);
+
+		if(const char* begin=strstr(CONTENT_TYPE, "CHARSET=")){
+			begin+=8; // skip "CHARSET="
+			char* end=0;
+			if(*begin && (*begin=='"' || *begin =='\'')){
+				char quote=*begin;
+				begin++;
+				end=(char*)strchr(begin, quote);
+			}
+			if(!end)
+				end=(char*)strchr(begin, ';');
+
+			if(end)
+				*end=0; // terminator
+
+			return *begin?&charsets.get(begin):0;
+		}
+	}
+	return 0;
+}
+
+
+static bool isLeap(int year) {
+	return !(
+				(year % 4) || ((year % 400) && !(year % 100))
+			); 
+}
+
+int getMonthDays(int year, int month) {
+	static int monthDays[]={
+		31, 
+		28, 
+		31, 
+		30, 
+		31, 
+		30, 
+		31, 
+		31, 
+		30, 
+		31, 
+		30, 
+		31
+	}; 
+	return (month == 1 /* january -- 0 */ && isLeap(year)) ? 29 : monthDays[month]; 
+}
+
+String::C date_gmt_string(tm* tms) {
+	/// http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
+	static const char month_names[12][4]={
+		"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
+	static const char days[7][4]={
+		"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
+
+	char *buf=new(PointerFreeGC) char[MAX_STRING];
+	return String::C(buf, 
+		snprintf(buf, MAX_STRING, "%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT", 
+		days[tms->tm_wday],
+		tms->tm_mday,month_names[tms->tm_mon],tms->tm_year+1900,
+		tms->tm_hour,tms->tm_min,tms->tm_sec));
+}