cvs: php4 / acconfig.h.in config.w32.h configure.in main.c

thies Thu May 18 21:45:34 2000 EDT Modified files: /php4 acconfig.h.in config.w32.h configure.in main.c Log: added new option "--enable-sigchild" (default is off) when using this option php will setup it's own SIGCHLD handler. when using oracle-libraries >= 8.1 on linux you need this option if you are connecting using the BEQ interface - elsewise you will see <defunc> processes whenever a php-script disconnects from oracle. Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.36 php4/acconfig.h.in:1.37 --- php4/acconfig.h.in:1.36 Sat Mar 11 23:22:31 2000 +++ php4/acconfig.h.in Thu May 18 21:45:29 2000 @@ -50,6 +50,9 @@ /* Set to the path to the dir containing safe mode executables */ #define PHP_SAFE_MODE_EXEC_DIR /usr/local/php/bin +/* Define if PHP to setup it's own SIGCHLD handler */ +#define PHP_SIGCHILD 0 + /* Define if you want POST/GET/Cookie track variables by default */ #define PHP_TRACK_VARS 0 Index: php4/config.w32.h diff -u php4/config.w32.h:1.24 php4/config.w32.h:1.25 --- php4/config.w32.h:1.24 Wed May 3 13:26:29 2000 +++ php4/config.w32.h Thu May 18 21:45:30 2000 @@ -2,6 +2,9 @@ /* tested only with MS Visual C++ V5 */ +/* Define if PHP to setup it's own SIGCHLD handler (not needed on Win32) */ +#define PHP_SIGCHILD 0 + /* if you have resolv.lib and lib44bsd95.lib you can compile the extra dns functions located in dns.c. Set this to 1. add resolv.lib and lib33bsd95.lib to the project settings, and add the path to the Index: php4/configure.in diff -u php4/configure.in:1.131 php4/configure.in:1.132 --- php4/configure.in:1.131 Thu May 18 19:43:19 2000 +++ php4/configure.in Thu May 18 21:45:32 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.131 2000/05/18 17:43:19 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.132 2000/05/18 19:45:32 thies Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -468,6 +468,15 @@ AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin") AC_MSG_RESULT(/usr/local/php/bin) ]) + +PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler, +[ --enable-sigchild Enable PHP's own SIGCHLD handler.],no) + +if test "$PHP_SIGCHILD" = "yes"; then + AC_DEFINE(PHP_SIGCHILD, 1) +else + AC_DEFINE(PHP_SIGCHILD, 0) +fi PHP_ARG_ENABLE(track-vars,whether to enable track_vars variables by default, [ --enable-track-vars Enable GET/POST/Cookie track variables by default.],yes) Index: php4/main.c diff -u php4/main.c:1.245 php4/main.c:1.246 --- php4/main.c:1.245 Thu May 18 17:34:21 2000 +++ php4/main.c Thu May 18 21:45:34 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.245 2000/05/18 15:34:21 zeev Exp $ */ +/* $Id: main.c,v 1.246 2000/05/18 19:45:34 thies Exp $ */ #include <stdio.h> @@ -637,8 +637,22 @@ } +#if PHP_SIGCHILD +static int sigchld_handler(int apar) +{ + int status; + wait(&status); + signal(SIGCHLD,sigchld_handler); +} +#endif + + int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) { +#if PHP_SIGCHILD + signal(SIGCHLD,sigchld_handler); +#endif + global_lock(); php_output_startup();