--- parser3/src/main/pa_request.C	2001/05/17 15:20:15	1.131
+++ parser3/src/main/pa_request.C	2001/07/18 10:06:04	1.144
@@ -4,14 +4,14 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_request.C,v 1.131 2001/05/17 15:20:15 parser Exp $
 */
+static const char *RCSId="$Id: pa_request.C,v 1.144 2001/07/18 10:06:04 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
 #include "pcre.h"
 #include "internal.h"
+extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -30,6 +30,7 @@ const char *UNHANDLED_EXCEPTION_CONTENT_
 
 /// content type of response when no $MAIN:defaults.content-type defined
 const char *DEFAULT_CONTENT_TYPE="text/html";
+const char *ORIGINS_CONTENT_TYPE="text/plain";
 
 Methoded *MOP_create(Pool&);
 
@@ -41,6 +42,7 @@ Request::Request(Pool& apool,
 	OP(*MOP_create(apool)),
 	env(apool),
 	form(apool),
+	math(apool),
 	request(apool, *this),
 	response(apool),
 	cookie(apool),
@@ -79,6 +81,8 @@ Request::Request(Pool& apool,
 	/// bases used
 	// form class
 	classes().put(form.get_class()->base()->name(), &form);	
+	// math class
+	classes().put(math.get_class()->base()->name(), &math);	
 }
 
 static void element2ctypes(unsigned char *tables, 
@@ -205,7 +209,7 @@ void Request::core(const char *root_auto
 				}
 				after=before+1;
 			}
-			for(int i=ladder.size(); --i>=0; ) {
+			for(int i=0; i<ladder.size(); i++) {
 				const String& sfile_spec=*ladder.get_string(i);
 				main_class=use_file(sfile_spec, false/*ignore read problem*/,
 					main_class_name, main_class);
@@ -214,7 +218,7 @@ void Request::core(const char *root_auto
 
 		// compile requested file
 		String& spath_translated=*NEW String(pool());
-		spath_translated.APPEND_CLEAN(info.path_translated, 0, "user-request", 0);
+		spath_translated.APPEND_TAINTED(info.path_translated, 0, "user-request", 0);
 		main_class=use_file(spath_translated, true/*don't ignore read problem*/,
 			main_class_name, main_class);
 
@@ -266,7 +270,8 @@ void Request::core(const char *root_auto
 			cstr2ctypes(pcre_tables, (const unsigned char *)"*+?{^.$|()[", ctype_meta);
 
 			element2case(pcre_tables, *ctype, *ctype_lowercase_name);
-		}
+		} else
+			pcre_tables=pcre_default_tables;
 
 		// filling form fields
 		form.fill_fields(*this);
@@ -275,7 +280,8 @@ void Request::core(const char *root_auto
 		cookie.fill_fields(*this);
 
 		// execute @main[]
-		const String *body_string=execute_method(*main_class, *main_method_name);
+		const String *body_string=execute_virtual_method(
+			*main_class, *main_method_name);
 		if(!body_string)
 			THROW(0,0,
 			0, 
@@ -299,13 +305,19 @@ void Request::core(const char *root_auto
 						NEW VString(*execute_method(frame, *method));
 				}
 
-		const VFile *body_file=body_vstring_after_post_process->as_vfile();
+		bool origins_mode=main_class->get_element(*origins_mode_name)!=0;
+
+		const VFile *body_file=body_vstring_after_post_process->as_vfile(
+			String::UL_UNSPECIFIED, origins_mode);
 
 		// extract response body
 		Value *body_value=static_cast<Value *>(
 			response.fields().get(*body_name));
 		if(body_value) // there is some $response.body
 			body_file=body_value->as_vfile();
+		else if(origins_mode)
+			response.fields().put(*content_type_name, 
+				NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE)));
 
 		// OK. write out the result
 		output_result(*body_file, header_only);
@@ -340,6 +352,8 @@ void Request::core(const char *root_auto
 
 			// reset language to default
 			flang=fdefault_lang;
+			if(flang==String::UL_USER_HTML)
+				flang=String::UL_HTML; // no _ & Co conversions in @exception[params]
 			
 			// reset response
 			response.fields().clear();
@@ -375,7 +389,7 @@ void Request::core(const char *root_auto
 							}
 #endif
 							frame.store_param(method->name, 
-								origin_value?origin_value:NEW VUnknown(pool()));
+								origin_value?origin_value:NEW VVoid(pool()));
 
 							// source
 							Value *source_value=0;
@@ -386,7 +400,7 @@ void Request::core(const char *root_auto
 								source_value=NEW VString(problem_source_copy);
 							}
 							frame.store_param(method->name, 
-								source_value?source_value:NEW VUnknown(pool()));
+								source_value?source_value:NEW VVoid(pool()));
 
 							// comment
 							String *comment_value=NEW String(pool(),
@@ -401,7 +415,7 @@ void Request::core(const char *root_auto
 								type_value=NEW VString(type_copy.append(*e.type(), 
 									flang, true));
 							} else
-								type_value=NEW VUnknown(pool());
+								type_value=NEW VVoid(pool());
 							frame.store_param(method->name, type_value);
 
 							// code
@@ -411,7 +425,7 @@ void Request::core(const char *root_auto
 								code_value=NEW VString(code_copy.append(*e.code(), 
 									flang, true));
 							} else
-								code_value=NEW VUnknown(pool());
+								code_value=NEW VVoid(pool());
 							frame.store_param(method->name, code_value);
 
 							// future $response:body=
@@ -456,7 +470,7 @@ void Request::core(const char *root_auto
 				body_string=NEW String(pool(), buf);
 			}
 
-			const VString body_vstring(*body_string);
+			VString body_vstring(*body_string);
 			const VFile *body_file=body_vstring.as_vfile();
 
 			// ERROR. write it out
@@ -501,7 +515,7 @@ VStateless_class *Request::use_buf(const
 	VStateless_class& cclass=COMPILE(source, aclass, name, base_class, file);
 
 	// locate and execute possible @auto[] static method
-	execute_method(cclass, *auto_method_name, false /*no result needed*/);
+	execute_nonvirtual_method(cclass, *auto_method_name, false /*no result needed*/);
 	return &cclass;
 }
 
@@ -598,4 +612,4 @@ const String& Request::mime_type_of(cons
 						"MIME-TYPE table column elements must not be empty");
 		}
 	return *NEW String(pool(), "application/octet-stream");
-}
\ No newline at end of file
+}