--- parser3/src/include/pa_request.h 2026/09/27 17:13:40 1.278 +++ parser3/src/include/pa_request.h 2026/10/13 16:14:53 1.285 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.278 2026/09/27 17:13:40 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.285 2026/10/13 16:14:53 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -37,7 +37,6 @@ const size_t pseudo_file_no__process=1; // forwards -class Temp_lang; class Methoded; class VMethodFrame; class VMail; @@ -54,9 +53,10 @@ extern int pa_execute_recursion_limit; extern int pa_httpd_timeout; extern size_t pa_file_size_limit; +class Code_cache; + /// Main workhorse. class Request: public PA_Object { - friend class Temp_lang; friend class Temp_connection; friend class Temp_request_self; friend class Temp_value_element; @@ -64,6 +64,7 @@ class Request: public PA_Object { friend class Request_context_saver; friend class Exception_trace; friend class VException; + friend class Code_cache_manager; public: class Trace { @@ -167,7 +168,7 @@ public: VMethodFrame* method_frame; Value* rcontext; WContext* wcontext; - /// current language + /// response untainting lang String::Language flang; /// current connection SQL_Connection* fconnection; @@ -211,7 +212,10 @@ public: core request processing BEWARE: may throw exception to you: catch it! */ - void core(const char* config_filespec, bool header_only, const String& amain_method_name = main_method_name, const String* amain_class_name = NULL); + void core(const char* config_filespec, const String& amain_method_name = main_method_name, const String* amain_class_name = NULL); + + /// ^response:send[part]: the headers go with the first part, the result of @main or exception is not sent then + void send(Value& part); /// executes ops void execute(ArrayOperation& ops); // execute.C @@ -267,8 +271,8 @@ public: /// for @USE only, calls ^use (which may be user-defined) void use_file(const String& file_name, const String* use_filespec, Operation::Origin origin); - /// compiles a @a source buffer - void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset=0); + /// compiles a @a source buffer, recording it into @a code if given, or replays the cached @a code + void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset=0, Code_cache* code=0); /// processes any code-junction there may be inside of @a value Value& process_getter(Junction& junction); // execute.C @@ -303,7 +307,10 @@ public: /// returns relative to @a path path to @a file const String& relative(const char* apath, const String& relative_name); - const String& full_disk_path(const String& relative_name); + /// '/'-normalized disk path of a file name; a uri of another scheme is returned as is if allowed, otherwise throws + const String& full_disk_path(const String& relative_name, uint allowed=0); + /// '/'-normalized full_disk_path of a real file on disk, which does not throw: 0 for a uri or a remote, invalid or tainted file:// one + const String* real_disk_path(const String& name); /// returns the mime type of 'user_file_name' const String& mime_type_of(const String* file_name); @@ -396,7 +403,7 @@ private: private: // compile.C - ArrayClass& compile(VStateless_class* aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset); + ArrayClass& compile(VStateless_class* aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset, Code_cache* code); private: // execute.C @@ -405,15 +412,15 @@ private: // execute.C Value& get_element4call(Value& ncontext, const String& name); #endif -private: // defaults - - const String::Language fdefault_lang; - private: // mime types /// $MAIN:MIME-TYPES Table *mime_types; +private: // true if ^response:send[] was used + + bool fheaders_sent; + private: // connection manipulation SQL_Connection* set_connection(SQL_Connection* aconnection) { @@ -462,8 +469,6 @@ class Request_context_saver { VMethodFrame* method_frame; Value* rcontext; WContext* wcontext; - /// current language - String::Language flang; /// current connection SQL_Connection* fconnection; @@ -475,13 +480,11 @@ public: method_frame(ar.method_frame), rcontext(ar.rcontext), wcontext(ar.wcontext), - flang(ar.flang), fconnection(ar.fconnection) {} void restore() { fr.stack.set_top_index(stack); fr.anti_endless_execute_recursion=anti_endless_execute_recursion; fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext; - fr.flang=flang; fr.fconnection=fconnection; } };