httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_cgid.c
Date Fri, 04 May 2001 18:42:56 GMT
trawick     01/05/04 11:42:55

  Modified:    server   mpm_common.c
               modules/generators mod_cgid.c
  Log:
  Build (and do so cleanly) when !APR_HAS_OTHER_CHILD.
  
  Revision  Changes    Path
  1.46      +4 -1      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mpm_common.c	2001/04/06 20:12:05	1.45
  +++ mpm_common.c	2001/05/04 18:42:45	1.46
  @@ -170,7 +170,9 @@
                   break;
               }
           }
  +#if APR_HAS_OTHER_CHILD
           apr_proc_other_child_check();
  +#endif
           if (!not_dead_yet) {
               /* nothing left to wait for */
               break;
  @@ -288,7 +290,8 @@
       if (name[0] == '#')
           return (atoi(&name[1]));
   
  -    if (!(ent = getpwnam(name))) {                                                    
 ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "%s: bad user name %s",
ap_server_argv0, name);
  +    if (!(ent = getpwnam(name))) {
  +        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "%s: bad user
name %s", ap_server_argv0, name);
           exit(1);
       }
       return (ent->pw_uid);
  
  
  
  1.85      +2 -2      httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- mod_cgid.c	2001/05/02 16:58:21	1.84
  +++ mod_cgid.c	2001/05/04 18:42:51	1.85
  @@ -226,9 +226,9 @@
       return av;
   }
   
  +#if APR_HAS_OTHER_CHILD
   static void cgid_maint(int reason, void *data, apr_wait_t status)
   {
  -#if APR_HAS_OTHER_CHILD
       pid_t *sd = data;
       switch (reason) {
           case APR_OC_REASON_DEATH:
  @@ -246,8 +246,8 @@
               kill(*sd, SIGHUP);
               break;
       }
  -#endif
   }
  +#endif
   
   static void get_req(int fd, request_rec *r, char **argv0, char ***env, int *req_type) 
   { 
  
  
  

Mime
View raw message