--- parser3/src/classes/image.C	2001/10/19 12:43:29	1.57
+++ parser3/src/classes/image.C	2001/10/29 13:04:45	1.60
@@ -4,7 +4,7 @@
 	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: image.C,v 1.57 2001/10/19 12:43:29 parser Exp $
+	$Id: image.C,v 1.60 2001/10/29 13:04:45 paf Exp $
 */
 
 /*
@@ -142,6 +142,7 @@ void measure_gif(Pool& pool, const Strin
 	height=little_endian_to_int(head->height);
 }
 
+/// @test remove ugly mech in reader - 20K limit
 void measure_jpeg(Pool& pool, const String *origin_string, 
 			 Measure_reader& reader, int& width, int& height) {
 	// JFIF format markers
@@ -202,7 +203,7 @@ void measure_jpeg(Pool& pool, const Stri
 
 void measure(Pool& pool, const String& file_name, 
 			 Measure_reader& reader, int& width, int& height) {
-	if(const char *cext=strrchr(file_name.cstr(), '.')) {
+	if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) {
 		cext++;
 		if(strcasecmp(cext, "GIF")==0)
 			measure_gif(pool, &file_name, reader, width, height);
@@ -317,7 +318,7 @@ static void _html(Request& r, const Stri
 			0/*no name*/,
 			false/*don't intercept string*/);
 		if(vattribs.is_defined()) // allow 'void'
-			if(attribs=vattribs.get_hash()) {
+			if(attribs=vattribs.get_hash(&method_name)) {
 				Attrib_info attrib_info={&tag, 0};
 				attribs->for_each(append_attrib_pair, &attrib_info);
 			} else