Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 17639 invoked from network); 14 Apr 2004 17:03:15 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 14 Apr 2004 17:03:15 -0000 Received: (qmail 66399 invoked by uid 500); 14 Apr 2004 17:02:39 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 66346 invoked by uid 500); 14 Apr 2004 17:02:38 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 66316 invoked by uid 500); 14 Apr 2004 17:02:38 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 66309 invoked from network); 14 Apr 2004 17:02:38 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 14 Apr 2004 17:02:38 -0000 Received: (qmail 17363 invoked by uid 1285); 14 Apr 2004 17:02:45 -0000 Date: 14 Apr 2004 17:02:45 -0000 Message-ID: <20040414170245.17362.qmail@minotaur.apache.org> From: bnicholes@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/04/14 10:02:45 Modified: server/mpm/netware Tag: APACHE_2_0_BRANCH mpm_netware.c Log: Fix a typo and clean up some tab characters. Submitted by: Guenter Knauf Revision Changes Path No revision No revision 1.62.2.20 +25 -25 httpd-2.0/server/mpm/netware/mpm_netware.c Index: mpm_netware.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v retrieving revision 1.62.2.19 retrieving revision 1.62.2.20 diff -u -r1.62.2.19 -r1.62.2.20 --- mpm_netware.c 18 Mar 2004 07:36:53 -0000 1.62.2.19 +++ mpm_netware.c 14 Apr 2004 17:02:45 -0000 1.62.2.20 @@ -64,7 +64,7 @@ #include "http_main.h" #include "http_log.h" #include "http_config.h" -#include "http_core.h" /* for get_remote_host */ +#include "http_core.h" /* for get_remote_host */ #include "http_connection.h" #include "scoreboard.h" #include "ap_mpm.h" @@ -128,10 +128,10 @@ static fd_set listenfds; static int listenmaxfd; -static apr_pool_t *pconf; /* Pool for config stuff */ -static apr_pool_t *pmain; /* Pool for httpd child stuff */ +static apr_pool_t *pconf; /* Pool for config stuff */ +static apr_pool_t *pmain; /* Pool for httpd child stuff */ -static pid_t ap_my_pid; /* it seems silly to call getpid all the time */ +static pid_t ap_my_pid; /* it seems silly to call getpid all the time */ static char *ap_my_addrspace = NULL; static int die_now = 0; @@ -248,11 +248,11 @@ static void sig_term(int sig) { if (shutdown_pending == 1) { - /* Um, is this _probably_ not an error, if the user has - * tried to do a shutdown twice quickly, so we won't - * worry about reporting it. - */ - return; + /* Um, is this _probably_ not an error, if the user has + * tried to do a shutdown twice quickly, so we won't + * worry about reporting it. + */ + return; } shutdown_pending = 1; @@ -376,7 +376,7 @@ for (;;) { if (shutdown_pending || restart_pending || (ap_scoreboard_image->servers[0][my_worker_num].status == WORKER_IDLE_KILL)) { DBPRINT1 ("\nThread slot %d is shutting down\n", my_worker_num); - clean_child_exit(0, my_worker_num, ptrans, bucket_alloc); + clean_child_exit(0, my_worker_num, ptrans, bucket_alloc); } /* Check the listen queue on all sockets for requests */ @@ -450,7 +450,7 @@ avg_retries += (MAX_WB_RETRIES-wouldblock_retry); } #endif - break; /* We have a socket ready for reading */ + break; /* We have a socket ready for reading */ } else { #ifdef DBINFO_ON @@ -584,7 +584,7 @@ */ static int idle_spawn_rate = 1; #ifndef MAX_SPAWN_RATE -#define MAX_SPAWN_RATE (64) +#define MAX_SPAWN_RATE (64) #endif static int hold_off_on_exponential_spawning; @@ -892,15 +892,15 @@ } ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, - "%s configured -- resuming normal operations", - ap_get_server_version()); + "%s configured -- resuming normal operations", + ap_get_server_version()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, - "Server built: %s", ap_get_server_built()); + "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, - "AcceptMutex: %s (default: %s)", - apr_proc_mutex_name(accept_mutex), - apr_proc_mutex_defname()); + "AcceptMutex: %s (default: %s)", + apr_proc_mutex_name(accept_mutex), + apr_proc_mutex_defname()); #endif show_server_data(); @@ -938,8 +938,8 @@ ++ap_my_generation; ap_scoreboard_image->global->running_generation = ap_my_generation; - ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, - "Graceful restart requested, doing restart"); + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, + "Graceful restart requested, doing restart"); /* Wait for all of the threads to terminate before initiating the restart */ while (worker_thread_count > 0) { @@ -978,7 +978,7 @@ ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD; ap_extended_status = 0; #ifdef AP_MPM_WANT_SET_MAX_MEM_FREE - ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED; + ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED; #endif return OK; @@ -1045,9 +1045,9 @@ renamescreen(opt_arg); } break; - case 'E': - /* Don't need to hold the screen open if the output is going to a file */ - hold_screen_on_exit = -1; + case 'E': + /* Don't need to hold the screen open if the output is going to a file */ + hold_screen_on_exit = -1; default: *(const char **)apr_array_push(mpm_new_argv) = apr_pstrdup(process->pool, optbuf); @@ -1142,7 +1142,7 @@ printf("\tDIRECTIVES - Show directives\n"); printf("\tHELP - Display this help information\n"); printf("\tMODULES - Show a list of the loaded modules\n"); - printf("\tRESTART - Reread the configurtion file and restart Apache\n"); + printf("\tRESTART - Reread the configuration file and restart Apache\n"); printf("\tSETTINGS - Show current thread status\n"); printf("\tSHUTDOWN - Shutdown Apache\n"); printf("\tVERSION - Display the server version information\n");