From 1e1df07282d1c7a98c7ffae7e7e6c6d2a9c7af27 Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Sun, 21 Jul 2002 02:23:33 +0000 Subject: - Add a small hack for worker MPM [1] (worker MPM with this hack seems to work without visible problems. and still requires -DFORCE_THREADING_MPM to build for worker MPM.) - Fix plist for worker MPM - Comment out fancy modules from default httpd.conf Tested on: ref5.freebsd.org, several 4-stable machines [1] --- www/apache22/files/patch-server:main.c | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 www/apache22/files/patch-server:main.c (limited to 'www/apache22/files/patch-server:main.c') diff --git a/www/apache22/files/patch-server:main.c b/www/apache22/files/patch-server:main.c new file mode 100644 index 000000000000..d297d4425fdb --- /dev/null +++ b/www/apache22/files/patch-server:main.c @@ -0,0 +1,36 @@ +--- server/main.c.orig Thu Jun 13 04:34:56 2002 ++++ server/main.c Sun Jul 21 08:54:09 2002 +@@ -78,6 +78,11 @@ + #include "ap_mpm.h" + #include "mpm_common.h" + ++#ifdef FREEBSD_THREAD_HACK ++#include ++AP_DECLARE(int) ap_exists_config_define(const char *name); ++#endif ++ + /* WARNING: Win32 binds http_main.c dynamically to the server. Please place + * extern functions and global data in another appropriate module. + * +@@ -558,6 +563,21 @@ + destroy_and_exit_process(process, 1); + } + ++#ifdef FREEBSD_THREAD_HACK ++ { ++ int r; ++ ++ if (! ap_exists_config_define("NO_DETACH")) { ++ if ((r = fork()) > 0) ++ return 0; ++ if (r == -1) { ++ perror("fork"); ++ return 0; ++ } ++ setsid(); ++ } ++ } ++#endif + ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp); + ap_fixup_virtual_hosts(pconf, server_conf); + ap_fini_vhost_config(pconf, server_conf); -- cgit v1.2.3