AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA access_compat_module =
+AP_DECLARE_MODULE(access_compat) =
{
STANDARD20_MODULE_STUFF,
create_access_compat_dir_config, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA auth_basic_module =
+AP_DECLARE_MODULE(auth_basic) =
{
STANDARD20_MODULE_STUFF,
create_auth_basic_dir_config, /* dir config creater */
ap_hook_fixups(add_auth_info, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA auth_digest_module =
+AP_DECLARE_MODULE(auth_digest) =
{
STANDARD20_MODULE_STUFF,
create_digest_dir_config, /* dir config creater */
ap_hook_handler(authenticate_form_redirect_handler, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA auth_form_module =
+AP_DECLARE_MODULE(auth_form) =
{
STANDARD20_MODULE_STUFF,
create_auth_form_dir_config, /* dir config creater */
&authn_anon_provider, AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authn_anon_module =
+AP_DECLARE_MODULE(authn_anon) =
{
STANDARD20_MODULE_STUFF,
create_authn_anon_dir_config, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authn_core_module =
+AP_DECLARE_MODULE(authn_core) =
{
STANDARD20_MODULE_STUFF,
create_authn_core_dir_config, /* dir config creater */
AUTHN_PROVIDER_VERSION,
&authn_dbd_provider, AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authn_dbd_module =
+AP_DECLARE_MODULE(authn_dbd) =
{
STANDARD20_MODULE_STUFF,
authn_dbd_cr_conf,
&authn_dbm_provider, AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authn_dbm_module =
+AP_DECLARE_MODULE(authn_dbm) =
{
STANDARD20_MODULE_STUFF,
create_authn_dbm_dir_config, /* dir config creater */
&authn_file_provider, AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authn_file_module =
+AP_DECLARE_MODULE(authn_file) =
{
STANDARD20_MODULE_STUFF,
create_authn_file_dir_config, /* dir config creater */
ap_hook_optional_fn_retrieve(ImportULDAPOptFn,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA authnz_ldap_module =
+AP_DECLARE_MODULE(authnz_ldap) =
{
STANDARD20_MODULE_STUFF,
create_authnz_ldap_dir_config, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_core_module =
+AP_DECLARE_MODULE(authz_core) =
{
STANDARD20_MODULE_STUFF,
create_authz_core_dir_config, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_dbd_module =
+AP_DECLARE_MODULE(authz_dbd) =
{
STANDARD20_MODULE_STUFF,
authz_dbd_cr_cfg,
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_dbm_module =
+AP_DECLARE_MODULE(authz_dbm) =
{
STANDARD20_MODULE_STUFF,
create_authz_dbm_dir_config, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_groupfile_module =
+AP_DECLARE_MODULE(authz_groupfile) =
{
STANDARD20_MODULE_STUFF,
create_authz_groupfile_dir_config,/* dir config creater */
&authz_all_provider, AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_host_module =
+AP_DECLARE_MODULE(authz_host) =
{
STANDARD20_MODULE_STUFF,
create_authz_host_dir_config, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_owner_module =
+AP_DECLARE_MODULE(authz_owner) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
AP_AUTH_INTERNAL_PER_CONF);
}
-module AP_MODULE_DECLARE_DATA authz_user_module =
+AP_DECLARE_MODULE(authz_user) =
{
STANDARD20_MODULE_STUFF,
create_authz_user_dir_config, /* dir config creater */
{ NULL }
};
-module AP_MODULE_DECLARE_DATA netware_module = {
+AP_DECLARE_MODULE(netware) = {
STANDARD20_MODULE_STUFF,
create_netware_dir_config, /* create per-dir config */
merge_netware_dir_configs, /* merge per-dir config */
APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
}
-module AP_MODULE_DECLARE_DATA nwssl_module =
+AP_DECLARE_MODULE(nwssl) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
#endif
{NULL}
};
-module AP_MODULE_DECLARE_DATA privileges_module = {
+AP_DECLARE_MODULE(privileges) = {
STANDARD20_MODULE_STUFF,
privileges_create_dir_cfg,
privileges_merge_dir_cfg,
{NULL}
};
-module AP_MODULE_DECLARE_DATA unixd_module = {
+AP_DECLARE_MODULE(unixd) = {
STANDARD20_MODULE_STUFF,
NULL,
NULL,
ap_hook_handler(isapi_handler, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA isapi_module = {
+AP_DECLARE_MODULE(isapi) = {
STANDARD20_MODULE_STUFF,
create_isapi_dir_config, /* create per-dir config */
merge_isapi_dir_configs, /* merge per-dir config */
{ NULL }
};
-module AP_MODULE_DECLARE_DATA win32_module = {
+AP_DECLARE_MODULE(win32) = {
STANDARD20_MODULE_STUFF,
create_win32_dir_config, /* create per-dir config */
merge_win32_dir_configs, /* merge per-dir config */
#include <string.h>
#endif
+APLOG_USE_MODULE(cache);
+
struct cache_cache_t {
int max_entries;
apr_size_t max_size;
#include "mod_cache.h"
+APLOG_USE_MODULE(cache);
+
extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;
extern module AP_MODULE_DECLARE_DATA cache_module;
#include <ap_provider.h>
+APLOG_USE_MODULE(cache);
+
/* -------------------------------------------------------------- */
extern APR_OPTIONAL_FN_TYPE(ap_cache_generate_key) *cache_generate_key;
ap_hook_post_config(cache_post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
}
-module AP_MODULE_DECLARE_DATA cache_module =
+AP_DECLARE_MODULE(cache) =
{
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
&cache_disk_provider);
}
-module AP_MODULE_DECLARE_DATA disk_cache_module = {
+AP_DECLARE_MODULE(disk_cache) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
}
-module AP_MODULE_DECLARE_DATA file_cache_module =
+AP_DECLARE_MODULE(file_cache) =
{
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
&socache_dbm);
}
-module AP_MODULE_DECLARE_DATA socache_dbm_module = {
+AP_DECLARE_MODULE(socache_dbm) = {
STANDARD20_MODULE_STUFF,
NULL, NULL, NULL, NULL, NULL,
register_hooks
&socache_dc);
}
-module AP_MODULE_DECLARE_DATA socache_dc_module = {
+AP_DECLARE_MODULE(socache_dc) = {
STANDARD20_MODULE_STUFF,
NULL, NULL, NULL, NULL, NULL,
register_hooks
#endif
}
-module AP_MODULE_DECLARE_DATA socache_memcache_module = {
+AP_DECLARE_MODULE(socache_memcache) = {
STANDARD20_MODULE_STUFF,
NULL, NULL, NULL, NULL, NULL,
register_hooks
&socache_shmcb);
}
-module AP_MODULE_DECLARE_DATA socache_shmcb_module = {
+AP_DECLARE_MODULE(socache_shmcb) = {
STANDARD20_MODULE_STUFF,
NULL, NULL, NULL, NULL, NULL,
register_hooks
{NULL}
};
-module AP_MODULE_DECLARE_DATA heartbeat_module = {
+AP_DECLARE_MODULE(heartbeat) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
{NULL}
};
-module AP_MODULE_DECLARE_DATA heartmonitor_module = {
+AP_DECLARE_MODULE(heartmonitor) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
{ NULL }
};
-module AP_MODULE_DECLARE_DATA so_module = {
+AP_DECLARE_MODULE(so) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config */
NULL, /* merge per-dir config */
/* the static hooks into our module from the other parts of the server. */
/* */
/*--------------------------------------------------------------------------*/
-AP_MODULE_DECLARE_DATA module watchdog_module = {
+AP_DECLARE_MODULE(watchdog) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
apr_dbd_init(pool);
}
-module AP_MODULE_DECLARE_DATA dbd_module = {
+AP_DECLARE_MODULE(dbd) = {
STANDARD20_MODULE_STUFF,
NULL,
NULL,
dav_fs_register(p);
}
-module AP_MODULE_DECLARE_DATA dav_fs_module =
+AP_DECLARE_MODULE(dav_fs) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
&dav_hooks_locks_generic);
}
-module AP_MODULE_DECLARE_DATA dav_lock_module =
+AP_DECLARE_MODULE(dav_lock) =
{
STANDARD20_MODULE_STUFF,
dav_lock_create_dir_config, /* dir config creater */
/* used to denote that mod_dav will be handling this request */
#define DAV_HANDLER_NAME "dav-handler"
+APLOG_USE_MODULE(dav);
+
enum {
DAV_ENABLED_UNSET = 0,
DAV_ENABLED_OFF,
#include "http_protocol.h"
#include "http_core.h"
+APLOG_USE_MODULE(dav);
/* ---------------------------------------------------------------
**
{NULL}
};
-module AP_MODULE_DECLARE_DATA bucketeer_module = {
+AP_DECLARE_MODULE(bucketeer) = {
STANDARD20_MODULE_STUFF,
NULL,
NULL,
{ NULL }
};
-module AP_MODULE_DECLARE_DATA dumpio_module = {
+AP_DECLARE_MODULE(dumpio) = {
STANDARD20_MODULE_STUFF,
NULL,
NULL,
APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA echo_module = {
+AP_DECLARE_MODULE(echo) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
AP_FTYPE_RESOURCE);
}
-module AP_MODULE_DECLARE_DATA case_filter_module =
+AP_DECLARE_MODULE(case_filter) =
{
STANDARD20_MODULE_STUFF,
NULL,
AP_FTYPE_RESOURCE);
}
-module AP_MODULE_DECLARE_DATA case_filter_in_module =
+AP_DECLARE_MODULE(case_filter_in) =
{
STANDARD20_MODULE_STUFF,
NULL,
* Module definition for configuration. If a particular callback is not
* needed, replace its routine name below with the word NULL.
*/
-module AP_MODULE_DECLARE_DATA example_hooks_module =
+AP_DECLARE_MODULE(example_hooks) =
{
STANDARD20_MODULE_STUFF,
x_create_dir_config, /* per-directory config creator */
}
/* Dispatch list for API hooks */
-module AP_MODULE_DECLARE_DATA example_ipc_module = {
+AP_DECLARE_MODULE(example_ipc) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config structures */
NULL, /* merge per-dir config structures */
"Max connections in READ state to permit from an untrusted client"),
{NULL}
};
-module AP_MODULE_DECLARE_DATA noloris_module = {
+AP_DECLARE_MODULE(noloris) = {
STANDARD20_MODULE_STUFF,
NULL,
NULL,
AP_FTYPE_CONTENT_SET);
}
-module AP_MODULE_DECLARE_DATA buffer_module = {
+AP_DECLARE_MODULE(buffer) = {
STANDARD20_MODULE_STUFF,
create_buffer_config, /* create per-directory config structure */
merge_buffer_config, /* merge per-directory config structures */
AP_FTYPE_RESOURCE);
}
-module AP_MODULE_DECLARE_DATA charset_lite_module =
+AP_DECLARE_MODULE(charset_lite) =
{
STANDARD20_MODULE_STUFF,
create_charset_dir_conf,
{NULL}
};
-module AP_MODULE_DECLARE_DATA deflate_module = {
+AP_DECLARE_MODULE(deflate) = {
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
return rv;
}
-module AP_MODULE_DECLARE_DATA ext_filter_module =
+AP_DECLARE_MODULE(ext_filter) =
{
STANDARD20_MODULE_STUFF,
create_ef_dir_conf,
{ NULL }
};
-module AP_MODULE_DECLARE_DATA filter_module = {
+AP_DECLARE_MODULE(filter) = {
STANDARD20_MODULE_STUFF,
filter_config,
filter_merge,
AP_FTYPE_RESOURCE);
}
-module AP_MODULE_DECLARE_DATA include_module =
+AP_DECLARE_MODULE(include) =
{
STANDARD20_MODULE_STUFF,
create_includes_dir_config, /* dir config creater */
NULL, AP_FTYPE_PROTOCOL + 3);
}
-module AP_MODULE_DECLARE_DATA ratelimit_module = {
+AP_DECLARE_MODULE(ratelimit) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
{NULL}
};
-module AP_MODULE_DECLARE_DATA reflector_module = {
+AP_DECLARE_MODULE(reflector) = {
STANDARD20_MODULE_STUFF,
create_reflector_dir_config,
merge_reflector_dir_config,
{NULL}
};
-module AP_MODULE_DECLARE_DATA reqtimeout_module = {
+AP_DECLARE_MODULE(reqtimeout) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config structures */
NULL, /* merge per-dir config structures */
APR_REGISTER_OPTIONAL_FN(ap_request_remove_filter);
}
-module AP_MODULE_DECLARE_DATA request_module = {
+AP_DECLARE_MODULE(request) = {
STANDARD20_MODULE_STUFF,
create_request_dir_config, /* create per-directory config structure */
merge_request_dir_config, /* merge per-directory config structures */
AP_FTYPE_RESOURCE);
}
-module AP_MODULE_DECLARE_DATA sed_module = {
+AP_DECLARE_MODULE(sed) = {
STANDARD20_MODULE_STUFF,
create_sed_dir_config, /* dir config creater */
NULL, /* dir merger --- default is to override */
{NULL}
};
-module AP_MODULE_DECLARE_DATA substitute_module = {
+AP_DECLARE_MODULE(substitute) = {
STANDARD20_MODULE_STUFF,
create_substitute_dcfg, /* dir config creater */
merge_substitute_dcfg, /* dir merger --- default is to override */
ap_hook_handler(asis_handler,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA asis_module =
+AP_DECLARE_MODULE(asis) =
{
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
ap_hook_handler(handle_autoindex,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA autoindex_module =
+AP_DECLARE_MODULE(autoindex) =
{
STANDARD20_MODULE_STUFF,
create_autoindex_config, /* dir config creater */
ap_hook_post_config(cgi_post_config, aszPre, NULL, APR_HOOK_REALLY_FIRST);
}
-module AP_MODULE_DECLARE_DATA cgi_module =
+AP_DECLARE_MODULE(cgi) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
ap_hook_handler(cgid_handler, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA cgid_module = {
+AP_DECLARE_MODULE(cgid) = {
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
ap_hook_handler(display_info, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA info_module = {
+AP_DECLARE_MODULE(info) = {
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
#endif
}
-module AP_MODULE_DECLARE_DATA status_module =
+AP_DECLARE_MODULE(status) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
ap_hook_post_config(suexec_post_config,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA suexec_module =
+AP_DECLARE_MODULE(suexec) =
{
STANDARD20_MODULE_STUFF,
create_mconfig_for_directory, /* create per-dir config */
#include <unistd.h>
#endif
+APLOG_USE_MODULE(http);
+
static int parse_byterange(char *range, apr_off_t clength,
apr_off_t *start, apr_off_t *end)
{
ap_method_registry_init(p);
}
-module AP_MODULE_DECLARE_DATA http_module = {
+AP_DECLARE_MODULE(http) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
#include <unistd.h>
#endif
+APLOG_USE_MODULE(http);
+
#define INVALID_CHAR -2
static long get_chunk_size(char *);
#include <unistd.h>
#endif
+APLOG_USE_MODULE(http);
+
/* New Apache routine to map status codes into array indicies
* e.g. 100 -> 0, 101 -> 1, 200 -> 2 ...
* The number of status lines must equal the value of RESPONSE_CODES (httpd.h)
#include <stdarg.h>
#endif
+APLOG_USE_MODULE(http);
+
/*****************************************************************
*
* Mainline request processing...
*/
}
-module AP_MODULE_DECLARE_DATA mime_module = {
+AP_DECLARE_MODULE(mime) = {
STANDARD20_MODULE_STUFF,
create_mime_dir_config, /* create per-directory config structure */
merge_mime_dir_configs, /* merge per-directory config structures */
ap_hook_child_init(util_ldap_child_init, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA ldap_module = {
+AP_DECLARE_MODULE(ldap) = {
STANDARD20_MODULE_STUFF,
util_ldap_create_dir_config, /* create dir config */
NULL, /* merge dir config */
#include "util_ldap_cache.h"
#include <apr_strings.h>
+APLOG_USE_MODULE(ldap);
+
#if APR_HAS_LDAP
/* only here until strdup is gone */
APR_REGISTER_OPTIONAL_FN(ap_log_set_writer);
}
-module AP_MODULE_DECLARE_DATA log_config_module =
+AP_DECLARE_MODULE(log_config) =
{
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config */
ap_hook_log_transaction(log_after,NULL,NULL,APR_HOOK_REALLY_LAST);
}
-module AP_MODULE_DECLARE_DATA log_forensic_module =
+AP_DECLARE_MODULE(log_forensic) =
{
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config */
APR_REGISTER_OPTIONAL_FN(ap_logio_get_last_bytes);
}
-module AP_MODULE_DECLARE_DATA logio_module =
+AP_DECLARE_MODULE(logio) =
{
STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config */
#include "lua_config.h"
#include "lua_vmprep.h"
+APLOG_USE_MODULE(lua);
+
static ap_lua_dir_cfg *check_dir_config(lua_State *L, int index)
{
ap_lua_dir_cfg *cfg;
#include "util_script.h"
#include "lua_apr.h"
+APLOG_USE_MODULE(lua);
+
typedef char *(*req_field_string_f) (request_rec * r);
typedef int (*req_field_int_f) (request_rec * r);
typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r);
#include "lua_config.h"
#include "apr_file_info.h"
+APLOG_USE_MODULE(lua);
+
/* forward dec'l from this file */
#if 0
APR_HOOK_REALLY_FIRST);
}
-module AP_MODULE_DECLARE_DATA lua_module = {
+AP_DECLARE_MODULE(lua) = {
STANDARD20_MODULE_STUFF,
create_dir_config, /* create per-dir config structures */
NULL, /* merge per-dir config structures */
ap_hook_handler(action_handler,NULL,NULL,APR_HOOK_LAST);
}
-module AP_MODULE_DECLARE_DATA actions_module =
+AP_DECLARE_MODULE(actions) =
{
STANDARD20_MODULE_STUFF,
create_action_dir_config, /* dir config creater */
ap_hook_fixups(fixup_redir,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA alias_module =
+AP_DECLARE_MODULE(alias) =
{
STANDARD20_MODULE_STUFF,
create_alias_dir_config, /* dir config creater */
ap_hook_fixups(fixup_dflt,NULL,NULL,APR_HOOK_LAST);
}
-module AP_MODULE_DECLARE_DATA dir_module = {
+AP_DECLARE_MODULE(dir) = {
STANDARD20_MODULE_STUFF,
create_dir_config, /* create per-directory config structure */
merge_dir_configs, /* merge per-directory config structures */
ap_hook_handler(imap_handler,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA imagemap_module =
+AP_DECLARE_MODULE(imagemap) =
{
STANDARD20_MODULE_STUFF,
create_imap_dir_config, /* dir config creater */
ap_hook_handler(handle_map_file,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA negotiation_module =
+AP_DECLARE_MODULE(negotiation) =
{
STANDARD20_MODULE_STUFF,
create_neg_dir_config, /* dir config creator */
}
/* the main config structure */
-module AP_MODULE_DECLARE_DATA rewrite_module = {
+AP_DECLARE_MODULE(rewrite) = {
STANDARD20_MODULE_STUFF,
config_perdir_create, /* create per-dir config structures */
config_perdir_merge, /* merge per-dir config structures */
ap_hook_fixups(check_speling,NULL,NULL,APR_HOOK_LAST);
}
-module AP_MODULE_DECLARE_DATA speling_module =
+AP_DECLARE_MODULE(speling) =
{
STANDARD20_MODULE_STUFF,
create_mconfig_for_directory, /* create per-dir config */
#endif
}
-module AP_MODULE_DECLARE_DATA userdir_module = {
+AP_DECLARE_MODULE(userdir) = {
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
ap_hook_translate_name(mva_translate, aszPre, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA vhost_alias_module =
+AP_DECLARE_MODULE(vhost_alias) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
ap_hook_fixups(add_cern_meta_data,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA cern_meta_module =
+AP_DECLARE_MODULE(cern_meta) =
{
STANDARD20_MODULE_STUFF,
create_cern_meta_dir_config, /* dir config creater */
ap_hook_fixups(fixup_env_module, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA env_module =
+AP_DECLARE_MODULE(env) =
{
STANDARD20_MODULE_STUFF,
create_env_dir_config, /* dir config creater */
ap_hook_insert_filter(expires_insert_filter, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA expires_module =
+AP_DECLARE_MODULE(expires) =
{
STANDARD20_MODULE_STUFF,
create_dir_expires_config, /* dir config creater */
ap_hook_post_read_request(ap_headers_early, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA headers_module =
+AP_DECLARE_MODULE(headers) =
{
STANDARD20_MODULE_STUFF,
create_headers_dir_config, /* dir config creater */
APR_REGISTER_OPTIONAL_FN(ap_ident_lookup);
}
-module AP_MODULE_DECLARE_DATA ident_module =
+AP_DECLARE_MODULE(ident) =
{
STANDARD20_MODULE_STUFF,
create_ident_dir_config, /* dir config creater */
* Apache API module interface
*/
-module AP_MODULE_DECLARE_DATA mime_magic_module =
+AP_DECLARE_MODULE(mime_magic) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creator */
ap_hook_post_read_request(remoteip_modify_connection, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA remoteip_module = {
+AP_DECLARE_MODULE(remoteip) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
ap_hook_post_config(setenvif_post_config, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA setenvif_module =
+AP_DECLARE_MODULE(setenvif) =
{
STANDARD20_MODULE_STUFF,
create_setenvif_config_dir, /* dir config creater */
ap_hook_post_read_request(gen_unique_id, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA unique_id_module = {
+AP_DECLARE_MODULE(unique_id) = {
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
ap_hook_fixups(spot_cookie,NULL,NULL,APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA usertrack_module = {
+AP_DECLARE_MODULE(usertrack) = {
STANDARD20_MODULE_STUFF,
make_cookie_dir, /* dir config creater */
NULL, /* dir merger --- default is to override */
{ NULL }
};
-module AP_MODULE_DECLARE_DATA version_module =
+AP_DECLARE_MODULE(version) =
{
STANDARD20_MODULE_STUFF,
NULL, /* dir config creater */
#include "ajp_header.h"
#include "ajp.h"
+APLOG_USE_MODULE(proxy_ajp);
+
static const char *response_trans_headers[] = {
"Content-Type",
"Content-Language",
#include "ajp.h"
+APLOG_USE_MODULE(proxy_ajp);
apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg)
{
#include "ajp.h"
+APLOG_USE_MODULE(proxy_ajp);
static char *hex_table = "0123456789ABCDEF";
#include "ajp.h"
+APLOG_USE_MODULE(proxy_ajp);
+
/*
* Handle the CPING/CPONG
*/
ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
}
-module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module = {
+AP_DECLARE_MODULE(lbmethod_bybusyness) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests);
}
-module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module = {
+AP_DECLARE_MODULE(lbmethod_byrequests) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic);
}
-module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module = {
+AP_DECLARE_MODULE(lbmethod_bytraffic) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
{NULL}
};
-module AP_MODULE_DECLARE_DATA lbmethod_heartbeat_module = {
+AP_DECLARE_MODULE(lbmethod_heartbeat) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);
}
-module AP_MODULE_DECLARE_DATA proxy_balancer_rr_module = {
+AP_DECLARE_MODULE(proxy_balancer_rr) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
}
-module AP_MODULE_DECLARE_DATA proxy_module =
+AP_DECLARE_MODULE(proxy) =
{
STANDARD20_MODULE_STUFF,
create_proxy_dir_config, /* create per-directory config structure */
proxy_hook_canon_handler(proxy_ajp_canon, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA proxy_ajp_module = {
+AP_DECLARE_MODULE(proxy_ajp) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
proxy_hook_canon_handler(proxy_balancer_canon, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA proxy_balancer_module = {
+AP_DECLARE_MODULE(proxy_balancer) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
{NULL}
};
-module AP_MODULE_DECLARE_DATA proxy_connect_module = {
+AP_DECLARE_MODULE(proxy_connect) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
proxy_hook_canon_handler(proxy_fcgi_canon, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA proxy_fcgi_module = {
+AP_DECLARE_MODULE(proxy_fcgi) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
proxy_hook_canon_handler(proxy_fdpass_canon, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA proxy_fdpass_module = {
+AP_DECLARE_MODULE(proxy_fdpass) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
};
-module AP_MODULE_DECLARE_DATA proxy_ftp_module = {
+AP_DECLARE_MODULE(proxy_ftp) = {
STANDARD20_MODULE_STUFF,
create_proxy_ftp_dir_config,/* create per-directory config structure */
merge_proxy_ftp_dir_config, /* merge per-directory config structures */
apr_pool_cleanup_register(p, p, warn_rx_free, apr_pool_cleanup_null);
}
-module AP_MODULE_DECLARE_DATA proxy_http_module = {
+AP_DECLARE_MODULE(proxy_http) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
}
-module AP_MODULE_DECLARE_DATA proxy_scgi_module = {
+AP_DECLARE_MODULE(proxy_scgi) = {
STANDARD20_MODULE_STUFF,
create_scgi_config, /* create per-directory config structure */
merge_scgi_config, /* merge per-directory config structures */
ap_hook_handler(serf_handler, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA serf_module =
+AP_DECLARE_MODULE(serf) =
{
STANDARD20_MODULE_STUFF,
create_dir_config,
#define apr_socket_create apr_socket_create_ex
#endif
+APLOG_USE_MODULE(proxy);
+
/*
* Opaque structure containing target server info when
* using a forward proxy.
APR_REGISTER_OPTIONAL_FN(ap_session_save);
}
-module AP_MODULE_DECLARE_DATA session_module =
+AP_DECLARE_MODULE(session) =
{
STANDARD20_MODULE_STUFF,
create_session_dir_config, /* dir config creater */
ap_hook_session_save(session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA session_cookie_module =
+AP_DECLARE_MODULE(session_cookie) =
{
STANDARD20_MODULE_STUFF,
create_session_cookie_dir_config, /* dir config creater */
ap_hook_post_config(ap_session_crypto_init, NULL, NULL, APR_HOOK_FIRST);
}
-module AP_MODULE_DECLARE_DATA session_crypto_module =
+AP_DECLARE_MODULE(session_crypto) =
{
STANDARD20_MODULE_STUFF,
create_session_crypto_dir_config, /* dir config creater */
ap_hook_monitor(session_dbd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA session_dbd_module =
+AP_DECLARE_MODULE(session_dbd) =
{
STANDARD20_MODULE_STUFF,
create_session_dbd_dir_config, /* dir config creater */
ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA slotmem_plain_module = {
+AP_DECLARE_MODULE(slotmem_plain) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA slotmem_shm_module = {
+AP_DECLARE_MODULE(slotmem_shm) = {
STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
{NULL}
};
-module AP_MODULE_DECLARE_DATA dialup_module =
+AP_DECLARE_MODULE(dialup) =
{
STANDARD20_MODULE_STUFF,
dialup_dcfg_create,
APR_REGISTER_OPTIONAL_FN(TestOptionalFn);
}
-module AP_MODULE_DECLARE_DATA optional_fn_export_module=
+AP_DECLARE_MODULE(optional_fn_export) =
{
STANDARD20_MODULE_STUFF,
NULL,
ap_hook_optional_fn_retrieve(ImportFnRetrieve,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA optional_fn_import_module =
+AP_DECLARE_MODULE(optional_fn_import) =
{
STANDARD20_MODULE_STUFF,
NULL,
ap_hook_log_transaction(ExportLogTransaction,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA optional_hook_export_module =
+AP_DECLARE_MODULE(optional_hook_export) =
{
STANDARD20_MODULE_STUFF,
NULL,
NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA optional_hook_import_module=
+AP_DECLARE_MODULE(optional_hook_import) =
{
STANDARD20_MODULE_STUFF,
NULL,
#define USER_LEN 8
+APLOG_USE_MODULE(core);
+
typedef enum
{
bs2_unknown, /* not initialized yet. */
unixd_config_rec ap_unixd_config;
+APLOG_USE_MODULE(core);
AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
const char *arg,
} while (!APR_BRIGADE_EMPTY(b) && (e != APR_BRIGADE_SENTINEL(b))); \
} while (0)
+APLOG_USE_MODULE(core);
int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
ap_input_mode_t mode, apr_read_type_e block,
#include "http_log.h"
#include "mpm_common.h"
+APLOG_USE_MODULE(core);
+
AP_DECLARE_DATA ap_listen_rec *ap_listeners = NULL;
static ap_listen_rec *old_listeners;
#include <unistd.h>
#endif
+APLOG_USE_MODULE(core);
+
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
* extern functions and global data in another appropriate module.
*
{NULL}
};
-module AP_MODULE_DECLARE_DATA mpm_event_module = {
+AP_DECLARE_MODULE(mpm_event) = {
MPM20_MODULE_STUFF,
NULL, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
#include <unistd.h>
#endif
+APLOG_USE_MODULE(mpm_event);
+
AP_DECLARE(apr_status_t) ap_event_pod_open(apr_pool_t * p, ap_event_pod_t ** pod)
{
apr_status_t rv;
{ NULL }
};
-module AP_MODULE_DECLARE_DATA mpm_mpmt_os2_module = {
+AP_DECLARE_MODULE(mpm_mpmt_os2) = {
MPM20_MODULE_STUFF,
NULL, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
#include <os2.h>
#include <process.h>
+APLOG_USE_MODULE(mpm_mpmt_os2);
+
/* XXXXXX move these to header file private to this MPM */
/* We don't need many processes,
{ NULL }
};
-module AP_MODULE_DECLARE_DATA mpm_netware_module = {
+AP_DECLARE_MODULE(mpm_netware) = {
MPM20_MODULE_STUFF,
netware_rewrite_args, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
{ NULL }
};
-module AP_MODULE_DECLARE_DATA mpm_prefork_module = {
+AP_DECLARE_MODULE(mpm_prefork) = {
MPM20_MODULE_STUFF,
NULL, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
-module AP_MODULE_DECLARE_DATA mpm_simple_module = {
+AP_DECLARE_MODULE(mpm_simple) = {
MPM20_MODULE_STUFF,
NULL, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
#define SPAWN_CHILDREN_INTERVAL (apr_time_from_sec(5))
+APLOG_USE_MODULE(mpm_simple);
+
static void simple_kill_random_child(simple_core_t * sc)
{
/* See comment in simple_spawn_child for why we check here. */
#endif
+APLOG_USE_MODULE(mpm_simple);
+
simple_core_t *simple_core_get()
{
return g_simple_core;
#include "scoreboard.h"
#include "http_vhost.h"
+APLOG_USE_MODULE(mpm_simple);
+
static void simple_io_timeout_cb(simple_core_t * sc, void *baton)
{
simple_conn_t *scon = (simple_conn_t *) baton;
#define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000)
#endif
+APLOG_USE_MODULE(mpm_simple);
+
/**
* Create Timers.
*/
#define PADDED_ADDR_SIZE (sizeof(SOCKADDR_IN)+16)
#endif
+APLOG_USE_MODULE(mpm_winnt);
+
/* Queue for managing the passing of winnt_conn_ctx_t between
* the accept and worker threads.
*/
ap_hook_mpm_get_name(winnt_get_name, NULL, NULL, APR_HOOK_MIDDLE);
}
-AP_MODULE_DECLARE_DATA module mpm_winnt_module = {
+AP_DECLARE_MODULE(mpm_winnt) = {
MPM20_MODULE_STUFF,
winnt_rewrite_args, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
#undef _WINUSER_
#include <winuser.h>
+APLOG_USE_MODULE(mpm_winnt);
+
/* Todo; clear up statics */
static char *mpm_service_name = NULL;
static char *mpm_display_name = NULL;
#include <unistd.h>
#endif
+APLOG_USE_MODULE(mpm_worker);
+
AP_DECLARE(apr_status_t) ap_worker_pod_open(apr_pool_t *p, ap_worker_pod_t **pod)
{
apr_status_t rv;
{ NULL }
};
-module AP_MODULE_DECLARE_DATA mpm_worker_module = {
+AP_DECLARE_MODULE(mpm_worker) = {
MPM20_MODULE_STUFF,
NULL, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
#include <unistd.h>
#endif
+APLOG_USE_MODULE(core);
+
#if AP_ENABLE_EXCEPTION_HOOK
APR_HOOK_STRUCT(
APR_HOOK_LINK(fatal_exception)
#endif
+APLOG_USE_MODULE(core);
+
typedef enum {DO_NOTHING, SEND_SIGTERM, SEND_SIGKILL, GIVEUP} action_t;
typedef struct extra_process_t {
#endif
+APLOG_USE_MODULE(core);
+
APR_HOOK_STRUCT(
APR_HOOK_LINK(post_read_request)
APR_HOOK_LINK(log_transaction)
#include <stdarg.h>
#endif
+APLOG_USE_MODULE(core);
+
APR_HOOK_STRUCT(
APR_HOOK_LINK(translate_name)
APR_HOOK_LINK(map_to_storage)
#include "scoreboard.h"
+APLOG_USE_MODULE(core);
+
AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
AP_DECLARE_DATA const char *ap_scoreboard_fname = NULL;
#define IS_SLASH(s) (s == '/')
#endif
+APLOG_USE_MODULE(core);
+
/*
* Examine a field value (such as a media-/content-type) string and return
#define LOG_PREFIX "ap_cookie: "
+APLOG_USE_MODULE(core);
+
/**
* Write an RFC2109 compliant cookie.
*
#include "http_core.h"
#include "util_ebcdic.h"
+APLOG_USE_MODULE(core);
+
apr_status_t ap_init_ebcdic(apr_pool_t *pool)
{
apr_status_t rv;
#include "http_core.h"
#include "ap_expr.h"
+
+APLOG_USE_MODULE(core);
+
#if 1
/*
* +-------------------------------------------------------+
* filter names to filters
*/
+APLOG_USE_MODULE(core);
+
typedef struct filter_trie_node filter_trie_node;
typedef struct {
#include <unistd.h> /* getpid() */
#endif
+APLOG_USE_MODULE(core);
+
AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,
apr_lockmech_e *mutexmech,
const char **mutexfile)
#define MALFORMED_MESSAGE "malformed header from script. Bad header="
#define MALFORMED_HEADER_LENGTH_TO_SHOW 30
+APLOG_USE_MODULE(core);
+
static char *http2env(apr_pool_t *a, const char *w)
{
char *res = (char *)apr_palloc(a, sizeof("HTTP_") + strlen(w));
#define READ_BLOCKSIZE 2048
+APLOG_USE_MODULE(core);
+
AP_DECLARE(int) ap_xml_parse_input(request_rec * r, apr_xml_doc **pdoc)
{
apr_xml_parser *parser;
#include <arpa/inet.h>
#endif
+APLOG_USE_MODULE(core);
+
/*
* After all the definitions there's an explanation of how it's all put
* together.
projects / apache / commitdiff