From aefc6b1525b66de0a6f9c25aba6ac998b294338a Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Tue, 13 Nov 2001 06:04:25 +0000 Subject: [PATCH] Remove commas from the end of the macros that define directives that are used by MPMs. Previous to this patch, you would use these macros without commans, which was unlike any other directives. Now, after the macro, you must have a comma. This makes the macros look more like the rest of the directives. I know this is cosmetic, and I was going to leave it alone, but when I found out that it bothered Cliff too, I decided to fix it after all. Submitted by: Ryan Bloom and Cliff Woolley git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91896 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 7 +++++++ include/ap_listen.h | 2 +- os/beos/beosd.h | 2 +- os/unix/unixd.h | 2 +- server/mpm/beos/beos.c | 4 ++-- server/mpm/experimental/perchild/perchild.c | 4 ++-- server/mpm/mpmt_os2/mpmt_os2.c | 2 +- server/mpm/netware/mpm_netware.c | 2 +- server/mpm/perchild/perchild.c | 4 ++-- server/mpm/prefork/prefork.c | 4 ++-- server/mpm/spmt_os2/spmt_os2.c | 2 +- server/mpm/threaded/threaded.c | 4 ++-- server/mpm/winnt/mpm_winnt.c | 2 +- server/mpm/worker/worker.c | 4 ++-- 14 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 4c25e9467a..5da854c97f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,12 @@ Changes with Apache 2.0.29-dev + *) Remove commas from the end of the macros that define + directives that are used by MPMs. Previous to this patch, + you would use these macros without commans, which was unlike + any other directives. Now, after the macro, you must have + a comma. This makes the macros look more like the rest of the + directives. [Ryan Bloom and Cliff Woolley] + *) Add 'redirect-carefully' environment option to disable sending redirects under special circumstances. This is helpful for Microsoft's WebFolders when accessing a directory resource via diff --git a/include/ap_listen.h b/include/ap_listen.h index fa9318f3d8..278e84e530 100644 --- a/include/ap_listen.h +++ b/include/ap_listen.h @@ -143,6 +143,6 @@ AP_INIT_TAKE1("ListenBacklog", ap_set_listenbacklog, NULL, RSRC_CONF, \ AP_INIT_TAKE1("Listen", ap_set_listener, NULL, RSRC_CONF, \ "A port number or a numeric IP address and a port number"), \ AP_INIT_TAKE1("SendBufferSize", ap_set_send_buffer_size, NULL, RSRC_CONF, \ - "Send buffer size in bytes"), + "Send buffer size in bytes") #endif diff --git a/os/beos/beosd.h b/os/beos/beosd.h index f30b3247a9..dc64cffdef 100644 --- a/os/beos/beosd.h +++ b/os/beos/beosd.h @@ -92,6 +92,6 @@ AP_DECLARE(const char *) beosd_set_group(cmd_parms *cmd, void *dummy, AP_INIT_TAKE1("User", beosd_set_user, NULL, RSRC_CONF, \ "Effective user id for this server (NO-OP)"), \ AP_INIT_TAKE1("Group", beosd_set_group, NULL, RSRC_CONF, \ - "Effective group id for this server (NO-OP)"), + "Effective group id for this server (NO-OP)") #endif /* BEOSD_H */ diff --git a/os/unix/unixd.h b/os/unix/unixd.h index 434013a748..35adbc147e 100644 --- a/os/unix/unixd.h +++ b/os/unix/unixd.h @@ -131,6 +131,6 @@ AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex); AP_INIT_TAKE1("User", unixd_set_user, NULL, RSRC_CONF, \ "Effective user id for this server"), \ AP_INIT_TAKE1("Group", unixd_set_group, NULL, RSRC_CONF, \ - "Effective group id for this server"), + "Effective group id for this server") #endif diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index 1d395a9582..3030240684 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -1087,8 +1087,8 @@ static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, const cha } static const command_rec beos_cmds[] = { -BEOS_DAEMON_COMMANDS -LISTEN_COMMANDS +BEOS_DAEMON_COMMANDS, +LISTEN_COMMANDS, AP_INIT_TAKE1( "StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup"), AP_INIT_TAKE1( "MinSpareThreads", set_min_spare_threads, NULL, RSRC_CONF, diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 9512227105..cd3aeb4a7b 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -1740,8 +1740,8 @@ static const char *assign_childuid(cmd_parms *cmd, void *dummy, const char *uid, } static const command_rec perchild_cmds[] = { -UNIX_DAEMON_COMMANDS -LISTEN_COMMANDS +UNIX_DAEMON_COMMANDS, +LISTEN_COMMANDS, AP_INIT_TAKE1("NumServers", set_num_daemons, NULL, RSRC_CONF, "Number of children alive at the same time"), AP_INIT_TAKE1("StartThreads", set_threads_to_start, NULL, RSRC_CONF, diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 04d95fdfc4..7d04a104fc 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -561,7 +561,7 @@ static const char *set_max_spare_threads(cmd_parms *cmd, void *dummy, static const command_rec mpmt_os2_cmds[] = { -LISTEN_COMMANDS +LISTEN_COMMANDS, AP_INIT_TAKE1( "StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup" ), AP_INIT_TAKE1("MinSpareThreads", set_min_spare_threads, NULL, RSRC_CONF, diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index e085887860..c8219587d1 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -1124,7 +1124,7 @@ static const char *set_thread_stacksize(cmd_parms *cmd, void *dummy, static const command_rec netware_mpm_cmds[] = { AP_INIT_TAKE1("ThreadStackSize", set_thread_stacksize, NULL, RSRC_CONF, "Stack size each created thread will use."), -LISTEN_COMMANDS +LISTEN_COMMANDS, AP_INIT_TAKE1("StartThreads", set_threads_to_start, NULL, RSRC_CONF, "Number of worker threads launched at server startup"), AP_INIT_TAKE1("MinSpareThreads", set_min_free_threads, NULL, RSRC_CONF, diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c index 9512227105..cd3aeb4a7b 100644 --- a/server/mpm/perchild/perchild.c +++ b/server/mpm/perchild/perchild.c @@ -1740,8 +1740,8 @@ static const char *assign_childuid(cmd_parms *cmd, void *dummy, const char *uid, } static const command_rec perchild_cmds[] = { -UNIX_DAEMON_COMMANDS -LISTEN_COMMANDS +UNIX_DAEMON_COMMANDS, +LISTEN_COMMANDS, AP_INIT_TAKE1("NumServers", set_num_daemons, NULL, RSRC_CONF, "Number of children alive at the same time"), AP_INIT_TAKE1("StartThreads", set_threads_to_start, NULL, RSRC_CONF, diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index d511a9ea36..913c61f025 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1378,8 +1378,8 @@ static const char *set_server_limit (cmd_parms *cmd, void *dummy, const char *ar } static const command_rec prefork_cmds[] = { -UNIX_DAEMON_COMMANDS -LISTEN_COMMANDS +UNIX_DAEMON_COMMANDS, +LISTEN_COMMANDS, AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup"), AP_INIT_TAKE1("MinSpareServers", set_min_free_servers, NULL, RSRC_CONF, diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c index 34a7c70f38..104a0a86ba 100644 --- a/server/mpm/spmt_os2/spmt_os2.c +++ b/server/mpm/spmt_os2/spmt_os2.c @@ -1256,7 +1256,7 @@ AP_DECLARE(void) ap_reset_connection_status(long conn_id) } static const command_rec spmt_os2_cmds[] = { -LISTEN_COMMANDS +LISTEN_COMMANDS, AP_INIT_TAKE1( "StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup" ), AP_INIT_TAKE1( "MinSpareServers", set_min_free_servers, NULL, RSRC_CONF, diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c index a7d62e5bfd..f637655938 100644 --- a/server/mpm/threaded/threaded.c +++ b/server/mpm/threaded/threaded.c @@ -1576,8 +1576,8 @@ static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, } static const command_rec threaded_cmds[] = { -UNIX_DAEMON_COMMANDS -LISTEN_COMMANDS +UNIX_DAEMON_COMMANDS, +LISTEN_COMMANDS, AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup"), AP_INIT_TAKE1("MinSpareThreads", set_min_spare_threads, NULL, RSRC_CONF, diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 899aae9c93..6b0ac33627 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -2086,7 +2086,7 @@ AP_DECLARE(apr_array_header_t *) ap_get_status_table(apr_pool_t *p) } static const command_rec winnt_cmds[] = { -LISTEN_COMMANDS +LISTEN_COMMANDS, { "ThreadsPerChild", set_threads_per_child, NULL, RSRC_CONF, TAKE1, "Number of threads each child creates" }, { NULL } diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 203688b11d..160988a230 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1641,8 +1641,8 @@ static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, } static const command_rec worker_cmds[] = { -UNIX_DAEMON_COMMANDS -LISTEN_COMMANDS +UNIX_DAEMON_COMMANDS, +LISTEN_COMMANDS, AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF, "Number of child processes launched at server startup"), AP_INIT_TAKE1("MinSpareThreads", set_min_spare_threads, NULL, RSRC_CONF,