--- parser3/src/classes/form.C	2003/02/26 11:29:55	1.34.2.7
+++ parser3/src/classes/form.C	2012/03/16 09:24:07	1.43
@@ -1,26 +1,24 @@
 /** @file
 	Parser: @b form parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_FORM_C="$Date: 2003/02/26 11:29:55 $";
-
 #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.43 2012/03/16 09:24:07 moko Exp $";
+
 /// $LIMITS.max_post_size default 10M
 const size_t MAX_POST_SIZE_DEFAULT=10*0x400*0x400;
 
 // class
 
 class MForm : public Methoded {
-public:
-	MForm(Pool& pool);
 public: // Methoded
 
 	bool used_directly() { return false; }
@@ -43,45 +41,44 @@ DECLARE_CLASS_VAR(form, 0/*fictive*/, ne
 
 // statics
 
-StringPtr max_post_size_name(new String(MAX_POST_SIZE_NAME));
-StringPtr limits_name(new String(LIMITS_NAME));
+static const String max_post_size_name(MAX_POST_SIZE_NAME);
+static const String limits_name(LIMITS_NAME);
 
 // methods
 
 // constructor & configurator
 
 void MForm::configure_admin(Request& r) {
-	Pool& pool=r.pool();
 
-	ValuePtr 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.method && StrStartFromNC(r.request_info.method, "post", true)) {
 		// $limits.max_post_size default 10M
-		ValuePtr element=limits?limits->get_element(max_post_size_name, *limits, false)
-			:ValuePtr(0);
+		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",
-				Exception::undefined_source,
-				"posted content_length(%u) > max_post_size(%u)",
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"posted content_length(%u) > $"LIMITS_NAME"."MAX_POST_SIZE_NAME"(%u)",
 					r.request_info.content_length, max_post_size);
-		if(r.request_info.content_length<0)
-			throw Exception(Exception::undefined_type,
-				Exception::undefined_source,
-				"posted content_length(%u) < 0",
-					r.request_info.content_length);
 
 		// read POST data
 		if(r.request_info.content_length) {
-			char *post_data=new(pool) char[r.request_info.content_length];
-			r.request_info.post_size=SAPI::read_post(r.sapi_info, 
+			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);
+			post_data[post_size]=0; // terminating zero
 			r.request_info.post_data=post_data;
+			r.request_info.post_size=post_size;
+		} else {
+			r.request_info.post_data=0;
+			r.request_info.post_size=0;
 		}
 		if(r.request_info.post_size!=r.request_info.content_length)
-			throw Exception(Exception::undefined_type, 
-				Exception::undefined_source, 
+			throw Exception(0, 
+				0, 
 				"post_size(%u) != content_length(%u)", 
 					r.request_info.post_size, r.request_info.content_length);
 	}