--- parser3/src/include/pa_request.h	2007/02/17 11:50:19	1.183
+++ parser3/src/include/pa_request.h	2007/10/22 13:44:42	1.185
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char * const IDENT_REQUEST_H="$Date: 2007/02/17 11:50:19 $";
+static const char * const IDENT_REQUEST_H="$Date: 2007/10/22 13:44:42 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -206,7 +206,7 @@ public:
 		// 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");
 		}
@@ -294,7 +294,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");
 
@@ -363,7 +363,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);
 	//}
 
@@ -510,7 +511,7 @@ public:
 // defines for externs
 
 #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"
@@ -522,7 +523,7 @@ extern const String main_method_name;
 extern const String auto_method_name;
 extern const String body_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;