--- parser3/src/classes/form.C	2002/07/01 14:00:36	1.24
+++ parser3/src/classes/form.C	2003/01/21 15:51:06	1.34
@@ -1,18 +1,18 @@
 /** @file
 	Parser: @b form parser class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: form.C,v 1.24 2002/07/01 14:00:36 paf Exp $
 */
 
+static const char* IDENT_FORM_C="$Date: 2003/01/21 15:51:06 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vform.h"
 
 /// $LIMITS.max_post_size default 10M
-const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400;
+const size_t MAX_POST_SIZE_DEFAULT=10*0x400*0x400;
 
 // defines
 
@@ -45,10 +45,10 @@ MForm::MForm(Pool& apool) : Methoded(apo
 void MForm::configure_admin(Request& r) {
 	Pool& pool=r.pool();
 
-	Value *limits=r.main_class?r.main_class->get_element(limits_name):0;
+	Value *limits=r.main_class.get_element(limits_name, r.main_class, false);
 	if(r.info.method && StrEqNc(r.info.method, "post", true)) {
 		// $limits.max_post_size default 10M
-		Value *element=limits?limits->get_element(max_post_size_name):0;
+		Value *element=limits?limits->get_element(max_post_size_name, *limits, false):0;
 		size_t value=element?(size_t)element->as_double():0;
 		size_t max_post_size=value?value:MAX_POST_SIZE_DEFAULT;
 		
@@ -56,22 +56,23 @@ void MForm::configure_admin(Request& r)
 			throw Exception("parser.runtime",
 				0,
 				"posted content_length(%u) > max_post_size(%u)",
-					r.content_length, max_post_size);
+					r.info.content_length, max_post_size);
 		if(r.info.content_length<0)
 			throw Exception(0,
 				0,
 				"posted content_length(%u) < 0",
-					r.content_length);
+					r.info.content_length);
 
 		// read POST data
 		if(r.info.content_length) {
-			r.post_data=(char *)pool.malloc(r.info.content_length);
-			r.post_size=SAPI::read_post(pool, r.post_data, r.info.content_length);
+			char *post_data=(char *)pool.malloc(r.info.content_length);
+			r.post_size=SAPI::read_post(pool, post_data, r.info.content_length);
+			r.post_data=post_data;
 		}
 		if(r.post_size!=r.info.content_length)
 			throw Exception(0, 
 				0, 
-				"post_size(%u)!=content_length(%u)", 
+				"post_size(%u) != content_length(%u)", 
 					r.post_size, r.info.content_length);
 	}
 }