--- parser3/src/targets/apache13/modules/extra/Attic/mod_parser3.C 2001/09/07 16:51:43 1.41.4.1 +++ parser3/src/targets/apache13/modules/extra/Attic/mod_parser3.C 2001/09/26 10:32:26 1.44 @@ -2,10 +2,10 @@ Parser: apache 1.3 module. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: mod_parser3.C,v 1.44 2001/09/26 10:32:26 parser Exp $ */ -static const char *RCSId="$Id: mod_parser3.C,v 1.41.4.1 2001/09/07 16:51:43 parser Exp $"; #include "httpd.h" #include "http_config.h" @@ -32,11 +32,29 @@ static const char *RCSId="$Id: mod_parse # define PARSER3_MODULE parser3_module #endif +// consts + +extern const char *main_RCSIds[]; +extern const char *smtp_RCSIds[]; +extern const char *gd_RCSIds[]; +extern const char *classes_RCSIds[]; +extern const char *types_RCSIds[]; +extern const char *ApacheModuleParser3_RCSIds[]; +const char **RCSIds[]={ + main_RCSIds, + smtp_RCSIds, + gd_RCSIds, + classes_RCSIds, + types_RCSIds, + ApacheModuleParser3_RCSIds, + 0 +}; + /// apache parser module configuration [httpd.conf + .htaccess-es] struct Parser_module_config { - const char* parser_root_auto_path; ///< filespec of admin's auto.p file - const char* parser_site_auto_path; ///< filespec of site's auto.p file + const char* parser_root_config_filespec; ///< filespec of admin's config file + const char* parser_site_config_filespec; ///< filespec of site's config file }; /* @@ -53,11 +71,11 @@ static Parser_module_config *our_dconfig ap_get_module_config(r->per_dir_config, &PARSER3_MODULE); } -static const char *cmd_parser_auto_path(cmd_parms *cmd, void *mconfig, char *file_spec) { +static const char *cmd_parser_config(cmd_parms *cmd, void *mconfig, char *file_spec) { Parser_module_config *cfg = (Parser_module_config *) mconfig; // remember assigned filespec into cfg - (cmd->info?cfg->parser_root_auto_path:cfg->parser_site_auto_path)=file_spec; + (cmd->info?cfg->parser_root_config_filespec:cfg->parser_site_config_filespec)=file_spec; return NULL; } @@ -218,8 +236,8 @@ static int parser_handler(request_rec *r // process the request request.core( - dcfg->parser_root_auto_path, true, // /path/to/admin/auto.p - dcfg->parser_site_auto_path, true, // /path/to/site/auto.p + dcfg->parser_root_config_filespec, true, // /path/to/admin/config + dcfg->parser_site_config_filespec, true, // /path/to/site/config r->header_only!=0); // no actions with request' data past this point // request.exception not not handled here, but all @@ -357,8 +375,8 @@ static void *parser_create_dir_config(po * Now fill in the defaults. If there are any `parent' configuration * records, they'll get merged as part of a separate callback. */ - cfg->parser_root_auto_path = 0; - cfg->parser_site_auto_path = 0; + cfg->parser_root_config_filespec = 0; + cfg->parser_site_config_filespec = 0; return (void *) cfg; } @@ -385,13 +403,13 @@ static void *parser_merge_dir_config(poo Parser_module_config *nconf = (Parser_module_config *) newloc_conf; // always from parent - merged_config->parser_root_auto_path = ap_pstrdup(p, pconf->parser_root_auto_path); + merged_config->parser_root_config_filespec = ap_pstrdup(p, pconf->parser_root_config_filespec); /* * Some things get copied directly from the more-specific record, rather * than getting merged. */ - merged_config->parser_site_auto_path = ap_pstrdup(p, nconf->parser_site_auto_path? - nconf->parser_site_auto_path:pconf->parser_site_auto_path); + merged_config->parser_site_config_filespec = ap_pstrdup(p, nconf->parser_site_config_filespec? + nconf->parser_site_config_filespec:pconf->parser_site_config_filespec); return (void *) merged_config; } @@ -411,8 +429,8 @@ static void *parser_create_server_config Parser_module_config *cfg= (Parser_module_config *) ap_pcalloc(p, sizeof(Parser_module_config)); - cfg->parser_root_auto_path = 0; - cfg->parser_site_auto_path = 0; + cfg->parser_root_config_filespec = 0; + cfg->parser_site_config_filespec = 0; return (void *) cfg; } @@ -443,10 +461,10 @@ static void *parser_merge_server_config( * Our inheritance rules are our own, and part of our module's semantics. * Basically, just note whence we came. */ - merged_config->parser_root_auto_path = ap_pstrdup(p, s2conf->parser_root_auto_path? - s2conf->parser_root_auto_path:s1conf->parser_root_auto_path); - merged_config->parser_site_auto_path = ap_pstrdup(p, s2conf->parser_site_auto_path? - s2conf->parser_site_auto_path:s1conf->parser_site_auto_path); + merged_config->parser_root_config_filespec = ap_pstrdup(p, s2conf->parser_root_config_filespec? + s2conf->parser_root_config_filespec:s1conf->parser_root_config_filespec); + merged_config->parser_site_config_filespec = ap_pstrdup(p, s2conf->parser_site_config_filespec? + s2conf->parser_site_config_filespec:s1conf->parser_site_config_filespec); return (void *) merged_config; } @@ -523,20 +541,20 @@ static int parser_access_checker(request static const command_rec parser_cmds[] = { { - DEBUG_PREFIX"parser_root_auto_path", /* directive name */ - (const char *(*)(void))((void *)cmd_parser_auto_path), // config action routine + DEBUG_PREFIX"ParserRootConfig", /* directive name */ + (const char *(*)(void))((void *)cmd_parser_config), // config action routine (void*)true, /* argument to include in call */ (int)(ACCESS_CONF|RSRC_CONF), /* where available */ TAKE1, /* arguments */ - "Parser root auto.p filespec (Admin)" // directive description + "Parser root config filespec (Admin)" // directive description }, { - DEBUG_PREFIX"parser_site_auto_path", /* directive name */ - (const char *(*)(void))((void *)cmd_parser_auto_path), // config action routine + DEBUG_PREFIX"ParserSiteConfig", /* directive name */ + (const char *(*)(void))((void *)cmd_parser_config), // config action routine (void*)false, /* argument to include in call */ (int)(OR_OPTIONS), /* where available */ TAKE1, /* arguments */ - "Parser site auto.p filespec" // directive description + "Parser site config filespec" // directive description }, {NULL} }; @@ -596,3 +614,12 @@ module MODULE_VAR_EXPORT PARSER3_MODULE 0, /* [8] fixups */ 0 /* [10] logger */ }; + +#if defined(_MSC_VER) +# define APACHE_WIN32_SRC "/parser3project/win32apache13/src" +# ifdef _DEBUG +# pragma comment(lib, APACHE_WIN32_SRC "/CoreD/ApacheCore.lib") +# else +# pragma comment(lib, APACHE_WIN32_SRC "/CoreR/ApacheCore.lib") +# endif +#endif