--- parser3/src/classes/form.C 2001/04/28 13:24:57 1.7 +++ parser3/src/classes/form.C 2001/09/21 14:46:09 1.15 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: form.C,v 1.7 2001/04/28 13:24:57 paf Exp $ */ +static const char *RCSId="$Id: form.C,v 1.15 2001/09/21 14:46:09 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -19,6 +18,8 @@ const size_t MAX_POST_SIZE_DEFAULT=10*0x #define FORM_CLASS_NAME "form" +#define LIMITS_NAME "LIMITS" + #define MAX_POST_SIZE_NAME "post_max_size" // class @@ -26,11 +27,12 @@ const size_t MAX_POST_SIZE_DEFAULT=10*0x 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 @@ -38,7 +40,8 @@ private: // constructor & configurator MForm::MForm(Pool& apool) : Methoded(apool), - max_post_size_name(apool, MAX_POST_SIZE_NAME) + max_post_size_name(apool, MAX_POST_SIZE_NAME), + limits_name(apool, LIMITS_NAME) { set_name(*NEW String(pool(), FORM_CLASS_NAME)); } @@ -46,7 +49,7 @@ 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?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; @@ -60,7 +63,7 @@ void MForm::configure_admin(Request& r) r.post_size, max_post_size); // read POST data - r.post_data=(char *)malloc(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,