--- parser3/src/classes/mail.C	2001/06/28 07:44:17	1.31
+++ parser3/src/classes/mail.C	2001/08/24 06:26:13	1.35
@@ -5,9 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.31 2001/06/28 07:44:17 parser Exp $
+	$Id: mail.C,v 1.35 2001/08/24 06:26:13 parser Exp $
 */
-static const char *RCSId="$Id: mail.C,v 1.31 2001/06/28 07:44:17 parser Exp $"; 
+static const char *RCSId="$Id: mail.C,v 1.35 2001/08/24 06:26:13 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -120,7 +120,9 @@ static void uuencode(String& result, con
 		"end\n";
 }
 
-/// ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] 
+/** ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] 
+	@todo solve - bad with html attaches
+*/
 static const String& attach_hash_to_string(Request& r, const String& origin_string, 
 										   Hash& attach_hash) {
 	Pool& pool=r.pool();
@@ -166,13 +168,13 @@ static const String& attach_hash_to_stri
 }
 
 
-static bool find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, 
+static void *find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, 
 							  void *) {
-	return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME);
+	return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME)?ameaning:0;
 }
-static bool find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, 
+static void *find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, 
 									  void *) {
-	return StrEqNc(aattribute.cstr(), "charset");
+	return StrEqNc(aattribute.cstr(), "charset")?ameaning:0;
 }
 
 /// used by mail: _send / letter_hash_to_string / add_header_attribute
@@ -276,7 +278,7 @@ static const String& letter_hash_to_stri
 
 			// body parts..
 			// ..collect
-			Mail_seq_item *seq=(Mail_seq_item *)malloc(sizeof(Mail_seq_item)*body_hash->size());
+			Mail_seq_item *seq=(Mail_seq_item *)pool.malloc(sizeof(Mail_seq_item)*body_hash->size());
 			Mail_seq_item *seq_ref=seq;  body_hash->for_each(add_part, &seq_ref);
 			// ..sort
 			_qsort(seq, body_hash->size(), sizeof(Mail_seq_item), 
@@ -418,7 +420,7 @@ static void sendmail(Request& r, const S
 static void _send(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& vhash=params->get_no_junction(0, "message must not be code");
+	Value& vhash=params->as_no_junction(0, "message must not be code");
 	Hash *hash=vhash.get_hash();
 	if(!hash)
 		PTHROW(0, 0,