diff options
| author | André Malo <nd@apache.org> | 2004-06-05 00:40:47 +0200 |
|---|---|---|
| committer | André Malo <nd@apache.org> | 2004-06-05 00:40:47 +0200 |
| commit | 7accf16eed5269fd6085d1b5ccf4a2739b73b0cd (patch) | |
| tree | 554b7daa186cbccc57a92e61a47522b0682626c0 /include | |
| parent | ooooops. This file somehow got cleaned. (diff) | |
| download | apache2-7accf16eed5269fd6085d1b5ccf4a2739b73b0cd.tar.xz apache2-7accf16eed5269fd6085d1b5ccf4a2739b73b0cd.zip | |
Nobody objected:
<IfModule> now takes the module identifier in addition to the
filename.
CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.
PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/http_config.h | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 3c94f4e411..d724fe7ef6 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -83,6 +83,7 @@ * 20040425 (2.1.0-dev) removed ap_add_named_module API * changed ap_add_module, ap_add_loaded_module, * ap_setup_prelinked_modules, ap_process_resource_config + * 20040425.1 (2.1.0-dev) Added ap_module_symbol_t and ap_prelinked_module_symbols */ #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */ @@ -90,7 +91,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20040425 #endif -#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/http_config.h b/include/http_config.h index b0cda63042..31b6dd6502 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -705,6 +705,14 @@ AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd, #ifdef CORE_PRIVATE /** + * This structure is used to assign symbol names to module pointers + */ +typedef struct { + const char *name; + module *modp; +} ap_module_symbol_t; + +/** * The topmost module in the list * @defvar module *ap_top_module */ @@ -716,6 +724,11 @@ AP_DECLARE_DATA extern module *ap_top_module; */ AP_DECLARE_DATA extern module *ap_prelinked_modules[]; /** + * Array of all statically linked modulenames (symbols) + * @defvar ap_module_symbol_t ap_prelinked_modulenames[] + */ +AP_DECLARE_DATA extern ap_module_symbol_t ap_prelinked_module_symbols[]; +/** * Array of all preloaded modules * @defvar module *ap_preloaded_modules[] */ |