--- parser3/src/include/pa_request.h	2006/11/16 18:02:49	1.182
+++ parser3/src/include/pa_request.h	2008/05/30 12:26:22	1.188
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char * const IDENT_REQUEST_H="$Date: 2006/11/16 18:02:49 $";
+static const char * const IDENT_REQUEST_H="$Date: 2008/05/30 12:26:22 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -18,6 +18,7 @@ static const char * const IDENT_REQUEST_
 #include "pa_request_info.h"
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
+#include "pa_vconsole.h"
 
 #ifdef RESOURCES_DEBUG
 #include <sys/resource.h>
@@ -200,12 +201,13 @@ public:
 
 	/// executes ops
 	void execute(ArrayOperation& ops); // execute.C
+	WContext* op_call(VMethodFrame& frame);
 	/// execute ops with anti-recoursion check
 	void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) {
 		// anti_endless_execute_recoursion
 		if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
 			anti_endless_execute_recoursion=0; // give @exception a chance
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0, //&name,
 				"call canceled - endless recursion detected");
 		}
@@ -293,7 +295,7 @@ public:
 	/// returns current SQL connection if any
 	SQL_Connection* connection(bool fail_on_error=true) { 
 		if(fail_on_error && !fconnection)
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"outside of 'connect' operator");
 
@@ -327,6 +329,8 @@ public:
 	VResponse& response;
 	/// $cookie:elements
 	VCookie& cookie;
+	/// $console
+	VConsole& console;
 
 	/// classes configured data
 	Hash<const String::Body, void*> classes_conf;
@@ -360,7 +364,8 @@ public: // status read methods
 		Execute_nonvirtual_method_result(): string(0), method(0) {}
 	};
 	Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name, VString* optional_param,
+		const String& method_name,
+		VString* optional_param,
 		bool do_return_string);
 	//}
 
@@ -506,10 +511,12 @@ public:
 
 // defines for externs
 
+#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding"
 #define CONTENT_DISPOSITION_NAME "content-disposition"
-#define CONTENT_DISPOSITION_VALUE "attachment"
+#define CONTENT_DISPOSITION_ATTACHMENT "attachment"
 #define CONTENT_DISPOSITION_INLINE "inline"
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
+
 #define EXCEPTION_HANDLED_PART_NAME "handled"
 
 
@@ -518,8 +525,10 @@ public:
 extern const String main_method_name;
 extern const String auto_method_name;
 extern const String body_name;
+
+extern const String content_transfer_encoding_name;
 extern const String content_disposition_name;
-extern const String content_disposition_value;
+extern const String content_disposition_attachment;
 extern const String content_disposition_inline;
 extern const String content_disposition_filename_name;