You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/04/05 04:09:44 UTC
cvs commit: apache-2.0/src/modules/standard mod_cgid.c mod_rewrite.c
trawick 00/04/04 19:09:44
Modified: src/include ap_config.h ap_ac_config.h
src/modules/standard mod_cgid.c mod_rewrite.c
Log:
stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly
Revision Changes Path
1.20 +0 -22 apache-2.0/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ap_config.h 2000/03/31 07:18:49 1.19
+++ ap_config.h 2000/04/05 02:09:43 1.20
@@ -1142,28 +1142,6 @@
#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)
1.13 +0 -2 apache-2.0/src/include/ap_ac_config.h
Index: ap_ac_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ap_ac_config.h 2000/04/03 18:40:36 1.12
+++ ap_ac_config.h 2000/04/05 02:09:43 1.13
@@ -227,6 +227,4 @@
#undef USE_MMAP_FILES
#endif
-#define signal(s, f) ap_signal(s, f)
-
#endif /* AP_AC_CONFIG_H */
1.6 +1 -1 apache-2.0/src/modules/standard/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_cgid.c 2000/03/31 09:05:16 1.5
+++ mod_cgid.c 2000/04/05 02:09:43 1.6
@@ -507,7 +507,7 @@
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) {
1.19 +1 -1 apache-2.0/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_rewrite.c 2000/03/31 09:05:18 1.18
+++ mod_rewrite.c 2000/04/05 02:09:44 1.19
@@ -3409,7 +3409,7 @@
ap_block_alarms();
#ifdef SIGHUP
- signal(SIGHUP, SIG_IGN);
+ ap_signal(SIGHUP, SIG_IGN);
#endif