--- parser3/src/main/pa_charsets.C	2012/03/16 09:24:13	1.19
+++ parser3/src/main/pa_charsets.C	2016/07/29 20:24:16	1.22
@@ -1,13 +1,13 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	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)
 */
 
 #include "pa_charsets.h"
 
-volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.19 2012/03/16 09:24:13 moko Exp $" IDENT_PA_CHARSETS_H;
+volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.22 2016/07/29 20:24:16 moko Exp $" IDENT_PA_CHARSETS_H;
 
 // defines for globals
 
@@ -25,16 +25,33 @@ Charsets::Charsets() {
 	put(UTF8_charset.NAME(), &UTF8_charset);
 }
 
-Charset& Charsets::get(const String::Body ANAME) {
+Charset& Charsets::get(String::Body ANAME) {
+	ANAME=str_upper(ANAME.cstr(), ANAME.length());
 	if(Charset* result=HashString<value_type>::get(ANAME))
 		return *result;
 	else
-		throw Exception(PARSER_RUNTIME,
-			new String(ANAME, String::L_TAINTED),
-			"unknown charset");
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
 }
 
-void Charsets::load_charset(Request_charsets& charsets, const String::Body ANAME, const String& afile_spec) {
+Charset& Charsets::get_direct(const char *ANAME) {
+	if(Charset* result=HashString<value_type>::get(ANAME))
+		return *result;
+	else
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
+}
+
+Charset* Charsets::checkBOM(char *&body,size_t &body_size, Charset* enforced_charset){
+	if((!enforced_charset || enforced_charset->isUTF8()) && (body_size>=3 && strncmp(body, "\xEF\xBB\xBF", 3)==0)){
+		// skip UTF-8 signature (BOM code)
+		body+=3;
+		body_size-=3;
+		return &UTF8_charset;
+	}
+	return enforced_charset;
+}
+
+void Charsets::load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec) {
+	ANAME=str_upper(ANAME.cstr(), ANAME.length());
 	//we know that charset?
 	if(HashString<value_type>::get(ANAME))
 		return; // don't load it then