httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/src/main mpm_common.c
Date Fri, 19 May 2000 07:10:58 GMT
fielding    00/05/19 00:10:57

  Modified:    src/main mpm_common.c
  Log:
  Temporary fix for misuse of int instead of pid_t.
  Also include mpm_common.h to pick up the common prototypes.
  
  Revision  Changes    Path
  1.4       +13 -10    apache-2.0/src/main/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mpm_common.c	2000/05/19 02:37:17	1.3
  +++ mpm_common.c	2000/05/19 07:10:57	1.4
  @@ -72,6 +72,7 @@
   #include "http_config.h"
   #include "http_log.h"
   #include "mpm.h"
  +#include "mpm_common.h"
   
   #ifdef DEXTER_MPM
   #define CHILD_INFO_TABLE     ap_child_table
  @@ -105,7 +106,7 @@
           /* now see who is done */
           not_dead_yet = 0;
           for (i = 0; i < ap_max_daemons_limit; ++i) {
  -            int pid = CHILD_INFO_TABLE[i].pid;
  +            pid_t pid = CHILD_INFO_TABLE[i].pid;
   
   #ifdef DEXTER_MPM
               if (ap_child_table[i].status == SERVER_DEAD)
  @@ -135,16 +136,17 @@
               case 7:     /* 1.4sec */
                   /* ok, now it's being annoying */
                   ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
  -                            0, ap_server_conf,
  -                   "child process %d still did not exit, sending a SIGTERM",
  -                            pid);
  +                             0, ap_server_conf,
  +                   "child process %ld still did not exit, sending a SIGTERM",
  +                             (long)pid);
                   kill(pid, SIGTERM);
                   break;
               case 8:     /*  6 sec */
                   /* die child scum */
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, ap_server_conf,
  -                   "child process %d still did not exit, sending a SIGKILL",
  -                            pid);
  +                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +                             0, ap_server_conf,
  +                   "child process %ld still did not exit, sending a SIGKILL",
  +                             (long)pid);
                   kill(pid, SIGKILL);
                   break;
               case 9:     /* 14 sec */
  @@ -153,9 +155,10 @@
                    * exited, we will likely fail to bind to the port
                    * after the restart.
                    */
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, ap_server_conf,
  -                            "could not make child process %d exit, "
  -                            "attempting to continue anyway", pid);
  +                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +                             0, ap_server_conf,
  +                             "could not make child process %ld exit, "
  +                             "attempting to continue anyway", (long)pid);
                   break;
               }
           }
  
  
  

Mime
View raw message