--- parser3/src/classes/form.C 2007/04/23 10:30:09 1.40 +++ parser3/src/classes/form.C 2026/10/16 15:16:21 1.54 @@ -1,20 +1,17 @@ /** @file Parser: @b form parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ -static const char * const IDENT_FORM_C="$Date: 2007/04/23 10:30:09 $"; - #include "classes.h" #include "pa_vmethod_frame.h" #include "pa_request.h" #include "pa_vform.h" -/// $LIMITS.max_post_size default 10M -const size_t MAX_POST_SIZE_DEFAULT=10*0x400*0x400; +volatile const char * IDENT_FORM_C="$Id: form.C,v 1.54 2026/10/16 15:16:21 moko Exp $"; // class @@ -32,17 +29,7 @@ public: // global variable -DECLARE_CLASS_VAR(form, 0/*fictive*/, new MForm); - -// defines for statics - -#define LIMITS_NAME "LIMITS" -#define MAX_POST_SIZE_NAME "post_max_size" - -// statics - -static const String max_post_size_name(MAX_POST_SIZE_NAME); -static const String limits_name(LIMITS_NAME); +DECLARE_CLASS_VAR(form, new MForm); // methods @@ -50,25 +37,14 @@ 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)) { - // $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; - - if(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); + if(r.request_info.can_have_body()){ + if(r.request_info.content_length>pa_post_max_size) + throw Exception(PARSER_RUNTIME, 0, "posted content_length(%s) > $LIMITS.post_max_size(%s)", pa_uitoa(r.request_info.content_length), pa_uitoa(pa_post_max_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 +53,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(%s) != content_length(%s)", pa_uitoa(r.request_info.post_size), pa_uitoa(r.request_info.content_length)); } }