--- parser3/src/main/untaint.C	2002/02/28 15:40:40	1.98
+++ parser3/src/main/untaint.C	2002/04/01 09:37:51	1.100
@@ -4,7 +4,7 @@
 	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: untaint.C,v 1.98 2002/02/28 15:40:40 paf Exp $
+	$Id: untaint.C,v 1.100 2002/04/01 09:37:51 paf Exp $
 */
 
 #include "pa_pool.h"
@@ -162,7 +162,7 @@ inline bool need_quote_http_header(const
 */
 String& String::append(const String& src, uchar lang, bool forced) {
 	if(!last_chunk) // growth stopped [we're appended as string to somebody]
-		throw Exception(0, 0,
+		throw Exception(0,
 			this,
 			"string growth stopped (append string)");
 
@@ -340,7 +340,8 @@ size_t String::cstr_bufsize(Untaint_lang
 
 char *String::store_to(char *dest, Untaint_lang lang, 
 					   SQL_Connection *connection,
-					   Charset *store_to_charset) const {
+					   Charset *store_to_charset,
+					   const char *store_to_charset_name) const {
 	// WARNING:
 	//	 before any changes check cstr_bufsize first!!!
 	bool whitespace=true;
@@ -394,7 +395,7 @@ char *String::store_to(char *dest, Untai
 			break;
 		case UL_MAIL_HEADER:
 			// tainted, untaint language: mail-header
-			if(store_to_charset) {
+			if(store_to_charset && store_to_charset_name) {
 				const void *mail_ptr;
 				size_t mail_size;
 				Charset::transcode(pool(), 
@@ -405,9 +406,11 @@ char *String::store_to(char *dest, Untai
 				const char *src=(const char *)mail_ptr;
 				bool to_quoted_printable=false;
 				for(int size=mail_size; size--; src++) {
-					if(*src & 0x80) {
+					if(*src & 0x80  // starting quote-printable-encoding on first 8bit char
+						|| (to_quoted_printable && (*src=='?' || *src=='=')) // additionally encoding '?' and '|'
+						) {
 						if(!to_quoted_printable) {
-							dest+=sprintf(dest, "=?%s?Q?", store_to_charset->name().cstr());
+							dest+=sprintf(dest, "=?%s?Q?", store_to_charset_name);
 							to_quoted_printable=true;
 						}
 						dest+=sprintf(dest, "=%02X", *src & 0xFF);
@@ -436,7 +439,7 @@ char *String::store_to(char *dest, Untai
 			if(connection)
 				dest+=connection->quote(dest, row->item.ptr, row->item.size);
 			else
-				throw Exception(0, 0,
+				throw Exception(0,
 					this,
 					"untaint in SQL language failed - no connection specified");
 			break;
@@ -470,7 +473,7 @@ char *String::store_to(char *dest, Untai
 			});
 			break;
 		default:
-			throw Exception(0, 0, 
+			throw Exception(0, 
 				this, 
 				"unknown untaint language #%d", 
 					static_cast<int>(row->item.lang)); // sould never
@@ -517,7 +520,7 @@ IFNDEF_NO_STRING_ORIGIN(
 );
 		uchar show_lang=row->item.lang & ~UL_OPTIMIZE_BIT;
 		if(show_lang>=sizeof(String_Untaint_lang_name)/sizeof(String_Untaint_lang_name[0]))
-			throw Exception(0, 0, 
+			throw Exception(0, 
 				this, 
 				"unknown untaint language #%d", 
 					static_cast<int>(show_lang)); // sould never