--- parser3/src/classes/form.C	2001/04/28 10:58:25	1.5
+++ parser3/src/classes/form.C	2002/03/27 15:30:33	1.22
@@ -1,67 +1,83 @@
 /** @file
 	Parser: @b form parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: form.C,v 1.5 2001/04/28 10:58:25 paf Exp $
+	$Id: form.C,v 1.22 2002/03/27 15:30:33 paf Exp $
 */
 
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vform.h"
 
-/// $LIMITS.post_max_size default 10M
+/// $LIMITS.max_post_size default 10M
 const size_t MAX_POST_SIZE_DEFAULT=10*0x400*400;
 
 // defines
 
 #define FORM_CLASS_NAME "form"
 
+#define LIMITS_NAME "LIMITS"
+
+#define MAX_POST_SIZE_NAME "post_max_size"
+
 // class
 
 class MForm : public Methoded {
 public:
 	MForm(Pool& pool);
-protected: // Methoded
+public: // Methoded
 	bool used_directly() { return false; }
 	void configure_admin(Request& r);
+private:
+	String max_post_size_name;
+	String limits_name;
 };
 
 // methods
 
 // constructor & configurator
 
-MForm::MForm(Pool& apool) : Methoded(apool) {
+MForm::MForm(Pool& apool) : Methoded(apool),
+	max_post_size_name(apool, MAX_POST_SIZE_NAME),
+	limits_name(apool, LIMITS_NAME)
+{
 	set_name(*NEW String(pool(), FORM_CLASS_NAME));
 }
 
 void MForm::configure_admin(Request& r) {
 	Pool& pool=r.pool();
 
-	Value *limits=r.main_class?r.main_class->get_element(*limits_name):0;
-//	if(r.info.method && StrEqNc(r.info.method, "post", true)) {
-		// $limits.post_max_size default 10M
-		Value *element=limits?limits->get_element(*post_max_size_name):0;
+	Value *limits=r.main_class?r.main_class->get_element(limits_name):0;
+	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;
 		size_t value=element?(size_t)element->as_double():0;
-		size_t post_max_size=value?value:MAX_POST_SIZE_DEFAULT;
+		size_t max_post_size=value?value:MAX_POST_SIZE_DEFAULT;
 		
-		if(r.info.content_length>post_max_size)
-			PTHROW(0, 0,
+		if(r.info.content_length>max_post_size)
+			throw Exception("parser.runtime",
 				0,
 				"posted content_length(%u) > max_post_size(%u)",
-					r.post_size, post_max_size);
+					r.post_size, max_post_size);
+		if(r.info.content_length<0)
+			throw Exception(0,
+				0,
+				"posted content_length(%u) < 0",
+					r.post_size);
 
 		// read POST data
-		r.post_data=(char *)malloc(r.info.content_length);
-		r.post_size=SAPI::read_post(pool, r.post_data, r.info.content_length);
+		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);
+		}
 		if(r.post_size!=r.info.content_length)
-			PTHROW(0, 0, 
+			throw Exception(0, 
 				0, 
 				"post_size(%u)!=content_length(%u)", 
 					r.post_size, r.info.content_length);
-//	}
+	}
 }
 
 // global variable