httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r951895 [2/2] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/deb...
Date Sun, 06 Jun 2010 16:59:55 GMT
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Sun Jun  6 16:59:50 2010
@@ -1018,7 +1018,7 @@ static void ap_proxy_balancer_register_h
     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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c Sun Jun  6 16:59:50 2010
@@ -522,7 +522,7 @@ static const command_rec cmds[] =
     {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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Sun Jun  6 16:59:50 2010
@@ -993,7 +993,7 @@ static void register_hooks(apr_pool_t *p
     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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c Sun Jun  6 16:59:50 2010
@@ -291,7 +291,7 @@ static void register_hooks(apr_pool_t *p
     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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Sun Jun  6 16:59:50 2010
@@ -2028,7 +2028,7 @@ static const command_rec proxy_ftp_cmds[
 };
 
 
-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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Sun Jun  6 16:59:50 2010
@@ -2045,7 +2045,7 @@ static void ap_proxy_http_register_hook(
     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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c Sun Jun  6 16:59:50 2010
@@ -616,7 +616,7 @@ static void register_hooks(apr_pool_t *p
 }
 
 
-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 */

Modified: httpd/httpd/trunk/modules/proxy/mod_serf.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_serf.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_serf.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_serf.c Sun Jun  6 16:59:50 2010
@@ -1147,7 +1147,7 @@ static void register_hooks(apr_pool_t *p
     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,

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sun Jun  6 16:59:50 2010
@@ -29,6 +29,8 @@
 #define apr_socket_create apr_socket_create_ex
 #endif
 
+APLOG_USE_MODULE(proxy);
+
 /*
  * Opaque structure containing target server info when
  * using a forward proxy.

Modified: httpd/httpd/trunk/modules/session/mod_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session.c Sun Jun  6 16:59:50 2010
@@ -625,7 +625,7 @@ static void register_hooks(apr_pool_t * 
     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 */

Modified: httpd/httpd/trunk/modules/session/mod_session_cookie.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_cookie.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_cookie.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_cookie.c Sun Jun  6 16:59:50 2010
@@ -263,7 +263,7 @@ static void register_hooks(apr_pool_t * 
     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 */

Modified: httpd/httpd/trunk/modules/session/mod_session_crypto.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_crypto.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_crypto.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_crypto.c Sun Jun  6 16:59:50 2010
@@ -628,7 +628,7 @@ static void register_hooks(apr_pool_t * 
     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 */

Modified: httpd/httpd/trunk/modules/session/mod_session_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_dbd.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_dbd.c Sun Jun  6 16:59:50 2010
@@ -616,7 +616,7 @@ static void register_hooks(apr_pool_t * 
     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 */

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c Sun Jun  6 16:59:50 2010
@@ -285,7 +285,7 @@ static void ap_slotmem_plain_register_ho
     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 */

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Sun Jun  6 16:59:50 2010
@@ -629,7 +629,7 @@ static void ap_slotmem_shm_register_hook
     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 */

Modified: httpd/httpd/trunk/modules/test/mod_dialup.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/mod_dialup.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/mod_dialup.c (original)
+++ httpd/httpd/trunk/modules/test/mod_dialup.c Sun Jun  6 16:59:50 2010
@@ -296,7 +296,7 @@ static const command_rec dialup_cmds[] =
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA dialup_module =
+AP_DECLARE_MODULE(dialup) =
 {
     STANDARD20_MODULE_STUFF,
     dialup_dcfg_create,

Modified: httpd/httpd/trunk/modules/test/mod_optional_fn_export.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/mod_optional_fn_export.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/mod_optional_fn_export.c (original)
+++ httpd/httpd/trunk/modules/test/mod_optional_fn_export.c Sun Jun  6 16:59:50 2010
@@ -36,7 +36,7 @@ static void ExportRegisterHooks(apr_pool
     APR_REGISTER_OPTIONAL_FN(TestOptionalFn);
 }
 
-module AP_MODULE_DECLARE_DATA optional_fn_export_module=
+AP_DECLARE_MODULE(optional_fn_export) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,

Modified: httpd/httpd/trunk/modules/test/mod_optional_fn_import.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/mod_optional_fn_import.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/mod_optional_fn_import.c (original)
+++ httpd/httpd/trunk/modules/test/mod_optional_fn_import.c Sun Jun  6 16:59:50 2010
@@ -43,7 +43,7 @@ static void ImportRegisterHooks(apr_pool
     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,

Modified: httpd/httpd/trunk/modules/test/mod_optional_hook_export.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/mod_optional_hook_export.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/mod_optional_hook_export.c (original)
+++ httpd/httpd/trunk/modules/test/mod_optional_hook_export.c Sun Jun  6 16:59:50 2010
@@ -32,7 +32,7 @@ static void ExportRegisterHooks(apr_pool
     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,

Modified: httpd/httpd/trunk/modules/test/mod_optional_hook_import.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/mod_optional_hook_import.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/mod_optional_hook_import.c (original)
+++ httpd/httpd/trunk/modules/test/mod_optional_hook_import.c Sun Jun  6 16:59:50 2010
@@ -33,7 +33,7 @@ static void ImportRegisterHooks(apr_pool
                      NULL,APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA optional_hook_import_module=
+AP_DECLARE_MODULE(optional_hook_import) =
 {
     STANDARD20_MODULE_STUFF,
     NULL,

Modified: httpd/httpd/trunk/os/bs2000/os.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/bs2000/os.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/os/bs2000/os.c (original)
+++ httpd/httpd/trunk/os/bs2000/os.c Sun Jun  6 16:59:50 2010
@@ -30,6 +30,8 @@
 
 #define USER_LEN 8
 
+APLOG_USE_MODULE(core);
+
 typedef enum
 {
     bs2_unknown,     /* not initialized yet. */

Modified: httpd/httpd/trunk/os/unix/unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.c (original)
+++ httpd/httpd/trunk/os/unix/unixd.c Sun Jun  6 16:59:50 2010
@@ -52,6 +52,7 @@
 
 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,

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core_filters.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Sun Jun  6 16:59:50 2010
@@ -75,6 +75,7 @@ do { \
     } 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,

Modified: httpd/httpd/trunk/server/listen.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/listen.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/listen.c (original)
+++ httpd/httpd/trunk/server/listen.c Sun Jun  6 16:59:50 2010
@@ -28,6 +28,8 @@
 #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;

Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Sun Jun  6 16:59:50 2010
@@ -45,6 +45,8 @@
 #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.
  *

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sun Jun  6 16:59:50 2010
@@ -2842,7 +2842,7 @@ static const command_rec event_cmds[] = 
     {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 */

Modified: httpd/httpd/trunk/server/mpm/event/pod.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/pod.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/pod.c (original)
+++ httpd/httpd/trunk/server/mpm/event/pod.c Sun Jun  6 16:59:50 2010
@@ -22,6 +22,8 @@
 #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;

Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c (original)
+++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c Sun Jun  6 16:59:50 2010
@@ -626,7 +626,7 @@ AP_INIT_TAKE1("ScoreBoardFile", ignore_c
 { 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 */

Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c (original)
+++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c Sun Jun  6 16:59:50 2010
@@ -36,6 +36,8 @@
 #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,

Modified: httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_netware.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Sun Jun  6 16:59:50 2010
@@ -1360,7 +1360,7 @@ AP_INIT_TAKE1("MaxThreads", set_thread_l
 { 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 */

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Sun Jun  6 16:59:50 2010
@@ -1523,7 +1523,7 @@ AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 { 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 */

Modified: httpd/httpd/trunk/server/mpm/simple/simple_api.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_api.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_api.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_api.c Sun Jun  6 16:59:50 2010
@@ -265,7 +265,7 @@ static const command_rec simple_cmds[] =
 
 
 
-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 */

Modified: httpd/httpd/trunk/server/mpm/simple/simple_children.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_children.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_children.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_children.c Sun Jun  6 16:59:50 2010
@@ -27,6 +27,8 @@
 
 #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. */

Modified: httpd/httpd/trunk/server/mpm/simple/simple_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_core.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_core.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_core.c Sun Jun  6 16:59:50 2010
@@ -31,6 +31,8 @@ static simple_core_t *g_simple_core;
 #endif
 
 
+APLOG_USE_MODULE(mpm_simple);
+
 simple_core_t *simple_core_get()
 {
     return g_simple_core;

Modified: httpd/httpd/trunk/server/mpm/simple/simple_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_io.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_io.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_io.c Sun Jun  6 16:59:50 2010
@@ -27,6 +27,8 @@
 #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;

Modified: httpd/httpd/trunk/server/mpm/simple/simple_run.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_run.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_run.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_run.c Sun Jun  6 16:59:50 2010
@@ -35,6 +35,8 @@
 #define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000)
 #endif
 
+APLOG_USE_MODULE(mpm_simple);
+
 /**
  * Create Timers.
  */

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Sun Jun  6 16:59:50 2010
@@ -64,6 +64,8 @@
 #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.
  */

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Sun Jun  6 16:59:50 2010
@@ -1740,7 +1740,7 @@ static void winnt_hooks(apr_pool_t *p)
     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 */

Modified: httpd/httpd/trunk/server/mpm/winnt/service.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/service.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/service.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/service.c Sun Jun  6 16:59:50 2010
@@ -34,6 +34,8 @@
 #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;

Modified: httpd/httpd/trunk/server/mpm/worker/pod.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/pod.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/pod.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/pod.c Sun Jun  6 16:59:50 2010
@@ -21,6 +21,8 @@
 #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;

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Sun Jun  6 16:59:50 2010
@@ -2351,7 +2351,7 @@ AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 { 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 */

Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Sun Jun  6 16:59:50 2010
@@ -56,6 +56,8 @@
 #include <unistd.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 #if AP_ENABLE_EXCEPTION_HOOK
 APR_HOOK_STRUCT(
     APR_HOOK_LINK(fatal_exception)

Modified: httpd/httpd/trunk/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.c (original)
+++ httpd/httpd/trunk/server/mpm_unix.c Sun Jun  6 16:59:50 2010
@@ -56,6 +56,8 @@
 #endif
 
 
+APLOG_USE_MODULE(core);
+
 typedef enum {DO_NOTHING, SEND_SIGTERM, SEND_SIGKILL, GIVEUP} action_t;
 
 typedef struct extra_process_t {

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Sun Jun  6 16:59:50 2010
@@ -57,6 +57,8 @@
 #endif
 
 
+APLOG_USE_MODULE(core);
+
 APR_HOOK_STRUCT(
     APR_HOOK_LINK(post_read_request)
     APR_HOOK_LINK(log_transaction)

Modified: httpd/httpd/trunk/server/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/request.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/request.c (original)
+++ httpd/httpd/trunk/server/request.c Sun Jun  6 16:59:50 2010
@@ -54,6 +54,8 @@
 #include <stdarg.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 APR_HOOK_STRUCT(
     APR_HOOK_LINK(translate_name)
     APR_HOOK_LINK(map_to_storage)

Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Sun Jun  6 16:59:50 2010
@@ -36,6 +36,8 @@
 
 #include "scoreboard.h"
 
+APLOG_USE_MODULE(core);
+
 AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
 AP_DECLARE_DATA const char *ap_scoreboard_fname = NULL;
 

Modified: httpd/httpd/trunk/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util.c (original)
+++ httpd/httpd/trunk/server/util.c Sun Jun  6 16:59:50 2010
@@ -80,6 +80,8 @@
 #define IS_SLASH(s) (s == '/')
 #endif
 
+APLOG_USE_MODULE(core);
+
 
 /*
  * Examine a field value (such as a media-/content-type) string and return

Modified: httpd/httpd/trunk/server/util_cookies.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_cookies.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_cookies.c (original)
+++ httpd/httpd/trunk/server/util_cookies.c Sun Jun  6 16:59:50 2010
@@ -21,6 +21,8 @@
 
 #define LOG_PREFIX "ap_cookie: "
 
+APLOG_USE_MODULE(core);
+
 /**
  * Write an RFC2109 compliant cookie.
  *

Modified: httpd/httpd/trunk/server/util_ebcdic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_ebcdic.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_ebcdic.c (original)
+++ httpd/httpd/trunk/server/util_ebcdic.c Sun Jun  6 16:59:50 2010
@@ -24,6 +24,8 @@
 #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;

Modified: httpd/httpd/trunk/server/util_expr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr.c (original)
+++ httpd/httpd/trunk/server/util_expr.c Sun Jun  6 16:59:50 2010
@@ -27,6 +27,9 @@
 #include "http_core.h"
 
 #include "ap_expr.h"
+
+APLOG_USE_MODULE(core);
+
 #if 1
 /*
  * +-------------------------------------------------------+

Modified: httpd/httpd/trunk/server/util_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_filter.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_filter.c (original)
+++ httpd/httpd/trunk/server/util_filter.c Sun Jun  6 16:59:50 2010
@@ -44,6 +44,8 @@
  * filter names to filters
  */
 
+APLOG_USE_MODULE(core);
+
 typedef struct filter_trie_node filter_trie_node;
 
 typedef struct {

Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Sun Jun  6 16:59:50 2010
@@ -41,6 +41,8 @@
 #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)

Modified: httpd/httpd/trunk/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_script.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_script.c (original)
+++ httpd/httpd/trunk/server/util_script.c Sun Jun  6 16:59:50 2010
@@ -52,6 +52,8 @@
 #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));

Modified: httpd/httpd/trunk/server/util_xml.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_xml.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_xml.c (original)
+++ httpd/httpd/trunk/server/util_xml.c Sun Jun  6 16:59:50 2010
@@ -29,6 +29,8 @@
 #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;

Modified: httpd/httpd/trunk/server/vhost.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/vhost.c?rev=951895&r1=951894&r2=951895&view=diff
==============================================================================
--- httpd/httpd/trunk/server/vhost.c (original)
+++ httpd/httpd/trunk/server/vhost.c Sun Jun  6 16:59:50 2010
@@ -39,6 +39,8 @@
 #include <arpa/inet.h>
 #endif
 
+APLOG_USE_MODULE(core);
+
 /*
  * After all the definitions there's an explanation of how it's all put
  * together.



Mime
View raw message