Commit 8cc8b66d authored by Jeff Trawick's avatar Jeff Trawick
Browse files

stop relying on a macro to map signal() to ap_signal(); call 

ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84916 13f79535-47bb-0310-9956-ffa450edef68
parent a063a193

include/ap_config.h

+0 −22
Changes for include/ap_config.h: 0 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -1142,28 +1142,6 @@ int setrlimit(int, struct rlimit *); 
#define INADDR_NONE ((unsigned long) -1)

#endif



#if 0

/* This stuff taken care of in APR XXXXX */

/*

 * Replace signal function with sigaction equivalent

 */

#ifndef NO_USE_SIGACTION

typedef void Sigfunc(int);



#if defined(SIG_IGN) && !defined(SIG_ERR)

#define SIG_ERR ((Sigfunc *)-1)

#endif



/*

 * For some strange reason, QNX defines signal to signal. Eliminate it.

 */

#ifdef signal

#undef signal

#endif

#define signal(s,f)	ap_signal(s,f)

Sigfunc *signal(int signo, Sigfunc * func);

#endif

#endif

#include <setjmp.h>



#if defined(USE_LONGJMP)

modules/generators/mod_cgid.c

+1 −1
Changes for modules/generators/mod_cgid.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int cgid_server(void *data) 
    cgid_server_conf *sconf = (cgid_server_conf *)ap_get_module_config( 

                       main_server->module_config, &cgid_module); 



    signal(SIGCHLD, SIG_IGN); 

    ap_signal(SIGCHLD, SIG_IGN); 

    unlink(sconf->sockname); 



    if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

modules/mappers/mod_rewrite.c

+1 −1
Changes for modules/mappers/mod_rewrite.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3409,7 +3409,7 @@ static int rewritemap_program_child(ap_context_t *p, char *progname, 
    ap_block_alarms();



#ifdef SIGHUP

    signal(SIGHUP, SIG_IGN);

    ap_signal(SIGHUP, SIG_IGN);

#endif