httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src alloc.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_rewrite.c
Date Mon, 16 Jun 1997 15:38:58 GMT
jim         97/06/16 08:38:58

  Modified:    src       alloc.c mod_log_agent.c mod_log_config.c
                        mod_log_referer.c  mod_rewrite.c
  Log:
  NT Cleanup. Remove allow for functions called by spawn_child_err
  to return if the exec under UNIX fails and let s_c_e take care of the exit. NT
  requires a return value, but a return value under UNIX simply means the process
  could not be execed
  
  Revision  Changes    Path
  1.30      +1 -1      apache/src/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/alloc.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** alloc.c	1997/06/15 19:22:23	1.29
  --- alloc.c	1997/06/16 15:38:54	1.30
  ***************
  *** 1187,1193 ****
        signal (SIGCHLD, SIG_DFL);	/* Was that it? */
        
        func (data);
  !     exit (0);			/* Should never get here... */
      }
    
      /* Parent process */
  --- 1187,1193 ----
        signal (SIGCHLD, SIG_DFL);	/* Was that it? */
        
        func (data);
  !     exit (1);			/* Should never get here... */
      }
    
      /* Parent process */
  
  
  
  1.13      +1 -2      apache/src/mod_log_agent.c
  
  Index: mod_log_agent.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_log_agent.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -C3 -r1.12 -r1.13
  *** mod_log_agent.c	1997/06/15 19:22:30	1.12
  --- mod_log_agent.c	1997/06/16 15:38:55	1.13
  ***************
  *** 102,108 ****
         * may want a common framework for this, since I expect it will
         * be common for other foo-loggers to want this sort of thing...
         */
  !     int child_pid = 0;
    
        cleanup_for_exec();
        signal (SIGHUP, SIG_IGN);
  --- 102,108 ----
         * may want a common framework for this, since I expect it will
         * be common for other foo-loggers to want this sort of thing...
         */
  !     int child_pid = 1;
    
        cleanup_for_exec();
        signal (SIGHUP, SIG_IGN);
  ***************
  *** 117,123 ****
    #endif    
        perror ("exec");
        fprintf (stderr, "Exec of shell for logging failed!!!\n");
  -     exit (1);
        return(child_pid);
    }
    
  --- 117,122 ----
  
  
  
  1.30      +1 -2      apache/src/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_log_config.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** mod_log_config.c	1997/06/15 19:22:30	1.29
  --- mod_log_config.c	1997/06/16 15:38:55	1.30
  ***************
  *** 679,685 ****
         * may want a common framework for this, since I expect it will
         * be common for other foo-loggers to want this sort of thing...
         */
  !     int child_pid = 0;
    
        cleanup_for_exec();
    #ifdef SIGHUP
  --- 679,685 ----
         * may want a common framework for this, since I expect it will
         * be common for other foo-loggers to want this sort of thing...
         */
  !     int child_pid = 1;
    
        cleanup_for_exec();
    #ifdef SIGHUP
  ***************
  *** 696,702 ****
    #endif
        perror ("exec");
        fprintf (stderr, "Exec of shell for logging failed!!!\n");
  -     exit (1);
        return(child_pid);
    }
    
  --- 696,701 ----
  
  
  
  1.13      +1 -2      apache/src/mod_log_referer.c
  
  Index: mod_log_referer.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_log_referer.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -C3 -r1.12 -r1.13
  *** mod_log_referer.c	1997/06/15 19:22:30	1.12
  --- mod_log_referer.c	1997/06/16 15:38:55	1.13
  ***************
  *** 116,122 ****
         * may want a common framework for this, since I expect it will
         * be common for other foo-loggers to want this sort of thing...
         */
  !     int child_pid = 0;
    
        cleanup_for_exec();
        signal (SIGHUP, SIG_IGN);
  --- 116,122 ----
         * may want a common framework for this, since I expect it will
         * be common for other foo-loggers to want this sort of thing...
         */
  !     int child_pid = 1;
    
        cleanup_for_exec();
        signal (SIGHUP, SIG_IGN);
  ***************
  *** 132,138 ****
    #endif
        perror ("execl");
        fprintf (stderr, "Exec of shell for logging failed!!!\n");
  -     exit (1);
        return(child_pid);
    }
    
  --- 132,137 ----
  
  
  
  1.30      +3 -7      apache/src/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** mod_rewrite.c	1997/06/15 19:22:31	1.29
  --- mod_rewrite.c	1997/06/16 15:38:55	1.30
  ***************
  *** 2282,2301 ****
    /* Child process code for 'RewriteLog "|..."' */
    static int rewritelog_child(void *cmd)
    {
  !     int child_pid = 0;
    
        cleanup_for_exec();
        signal(SIGHUP, SIG_IGN);
    #if defined(WIN32)
        child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
  -     return(child_pid);
    #elif defined(__EMX__)
        /* OS/2 needs a '/' */
        execl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
    #else
        execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
    #endif
  -     exit(1);
        return(child_pid);
    }
    
  --- 2282,2299 ----
    /* Child process code for 'RewriteLog "|..."' */
    static int rewritelog_child(void *cmd)
    {
  !     int child_pid = 1;
    
        cleanup_for_exec();
        signal(SIGHUP, SIG_IGN);
    #if defined(WIN32)
        child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
    #elif defined(__EMX__)
        /* OS/2 needs a '/' */
        execl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
    #else
        execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
    #endif
        return(child_pid);
    }
    
  ***************
  *** 2435,2455 ****
    /* child process code */
    static int rewritemap_program_child(void *cmd)
    {
  !     int child_pid = 0;
        
        cleanup_for_exec();
        signal(SIGHUP, SIG_IGN);
    #if defined(WIN32)
        child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
  -     return(child_pid);
    #elif defined(__EMX__)
        /* OS/2 needs a '/' */
        execl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
    #else
        execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
    #endif
  !     exit(1);
  !     return(0);
    }
    
    
  --- 2433,2451 ----
    /* child process code */
    static int rewritemap_program_child(void *cmd)
    {
  !     int child_pid = 1;
        
        cleanup_for_exec();
        signal(SIGHUP, SIG_IGN);
    #if defined(WIN32)
        child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
    #elif defined(__EMX__)
        /* OS/2 needs a '/' */
        execl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
    #else
        execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
    #endif
  !     return(child_pid);
    }
    
    
  
  
  

Mime
View raw message