--- parser3/src/targets/apache13/modules/extra/Attic/mod_parser3.C 2001/04/03 07:32:47 1.21 +++ parser3/src/targets/apache13/modules/extra/Attic/mod_parser3.C 2001/04/28 16:04:55 1.32 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: mod_parser3.C,v 1.21 2001/04/03 07:32:47 paf Exp $ + $Id: mod_parser3.C,v 1.32 2001/04/28 16:04:55 paf Exp $ */ #include "httpd.h" @@ -17,10 +17,12 @@ #include "util_script.h" #include "pa_sapi.h" +#include "classes.h" #include "pa_common.h" #include "pa_globals.h" #include "pa_request.h" #include "pa_version.h" +#include "pa_socks.h" struct Parser_module_config { const char* parser_root_auto_path; /// filespec of admin's auto.p file @@ -79,12 +81,23 @@ static const char *cmd_parser_auto_path( //@{ /// SAPI func decl +void SAPI::log(Pool& pool, const char *fmt, ...) { + request_rec *r=static_cast(pool.context()); + + va_list args; + va_start(args,fmt); + char buf[MAX_STRING]; + vsnprintf(buf, MAX_STRING, fmt, args); + ap_log_rerror(0, 0, APLOG_ERR | APLOG_NOERRNO, r, "%s", buf); + va_end(args); +} + const char *SAPI::get_env(Pool& pool, const char *name) { request_rec *r=static_cast(pool.context()); return (const char *)ap_table_get(r->subprocess_env, name); } -uint SAPI::read_post(Pool& pool, char *buf, uint max_bytes) { +size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) { request_rec *r=static_cast(pool.context()); /* ap_log_error(APLOG_MARK, APLOG_DEBUG, r->server, @@ -141,16 +154,6 @@ void SAPI::send_body(Pool& pool, const v ap_kill_timeout(r); } -void SAPI::log(Pool& pool, const char *fmt, ...) { - request_rec *r=static_cast(pool.context()); - - va_list args; - va_start(args,fmt); - char buf[MAX_STRING]; - vsnprintf(buf, MAX_STRING, fmt, args); - ap_log_rerror(0, 0, APLOG_ERR | APLOG_NOERRNO, r, "%s", buf); - va_end(args); -} //@} /** @@ -191,7 +194,7 @@ static int parser_handler(request_rec *r // prepare to process request Request request(pool, request_info, - String::UL_HTML_TYPO + String::UL_USER_HTML ); // process the request @@ -218,7 +221,7 @@ static int parser_handler(request_rec *r // prepare header SAPI::add_header_attribute(pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); SAPI::add_header_attribute(pool, "content-length", content_length_cstr); // send header @@ -287,6 +290,11 @@ static void setup_module_cells() { */ static Pool pool(ap_make_sub_pool(NULL)); // global pool PTRY { + // init socks + init_socks(pool); + + // init global classes + init_methoded_array(pool); // init global variables pa_globals_init(pool); } PCATCH(e) { // global problem