--- parser3/src/classes/form.C	2003/07/24 11:31:20	1.35
+++ parser3/src/classes/form.C	2024/11/04 03:53:25	1.52
@@ -1,18 +1,18 @@
 /** @file
 	Parser: @b form parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-static const char* IDENT_FORM_C="$Date: 2003/07/24 11:31:20 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
 #include "pa_request.h"
 #include "pa_vform.h"
 
+volatile const char * IDENT_FORM_C="$Id: form.C,v 1.52 2024/11/04 03:53:25 moko Exp $";
+
 /// $LIMITS.max_post_size default 10M
 const size_t MAX_POST_SIZE_DEFAULT=10*0x400*0x400;
 
@@ -32,7 +32,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(form, 0/*fictive*/, new MForm);
+DECLARE_CLASS_VAR(form, new MForm);
 
 // defines for statics
 
@@ -50,25 +50,20 @@ static const String limits_name(LIMITS_N
 
 void MForm::configure_admin(Request& r) {
 
-	Value* limits=r.main_class.get_element(limits_name, r.main_class, false);
-	if(r.request_info.method && StrEqNc(r.request_info.method, "post", true)) {
+	Value* limits=r.main_class.get_element(limits_name);
+	if(r.request_info.can_have_body()){
 		// $limits.max_post_size default 10M
-		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;
+		Value* element=limits ? limits->get_element(max_post_size_name) : 0;
+		size_t value=element ? (size_t)element->as_double() : 0;
+		size_t max_post_size=value ? value : MAX_POST_SIZE_DEFAULT;
 		
 		if(r.request_info.content_length>max_post_size)
-			throw Exception("parser.runtime",
-				0,
-				"posted content_length(%u) > max_post_size(%u)",
-					r.request_info.content_length, max_post_size);
+			throw Exception(PARSER_RUNTIME, 0, "posted content_length(%u) > $" LIMITS_NAME "." MAX_POST_SIZE_NAME "(%u)", r.request_info.content_length, max_post_size);
 
 		// read POST data
 		if(r.request_info.content_length) {
 			char *post_data=new(PointerFreeGC) char[r.request_info.content_length+1/*terminating zero*/];
-			size_t post_size=SAPI::read_post(r.sapi_info, 
-					post_data, r.request_info.content_length);
+			size_t post_size=SAPI::read_post(r.sapi_info, post_data, r.request_info.content_length);
 			post_data[post_size]=0; // terminating zero
 			r.request_info.post_data=post_data;
 			r.request_info.post_size=post_size;
@@ -77,9 +72,6 @@ void MForm::configure_admin(Request& r)
 			r.request_info.post_size=0;
 		}
 		if(r.request_info.post_size!=r.request_info.content_length)
-			throw Exception(0, 
-				0, 
-				"post_size(%u) != content_length(%u)", 
-					r.request_info.post_size, r.request_info.content_length);
+			throw Exception(0, 0, "post_size(%u) != content_length(%u)", r.request_info.post_size, r.request_info.content_length);
 	}
 }