OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 29-Jul-2003 15:31:02
Branch: HEAD Handle: 2003072914310001
Modified files:
openpkg-src/apache apache.patch apache.spec
openpkg-web news.txt
Log:
fix suexec-zombie problem, see also
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21737
Summary:
Revision Changes Path
1.7 +21 -0 openpkg-src/apache/apache.patch
1.160 +1 -1 openpkg-src/apache/apache.spec
1.5899 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 apache.patch
--- openpkg-src/apache/apache.patch 18 Jul 2003 17:34:11 -0000 1.6
+++ openpkg-src/apache/apache.patch 29 Jul 2003 13:31:01 -0000 1.7
@@ -44,3 +44,24 @@
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
+--- apache_1.3.28/src/main/alloc.c.dist 2003-07-29 15:23:08.000000000 +0200
++++ apache_1.3.28/src/main/alloc.c 2003-07-29 15:25:08.000000000 +0200
+@@ -2858,13 +2858,11 @@
+ for (p = procs; p; p = p->next) {
+ if ((p->kill_how == kill_after_timeout)
+ || (p->kill_how == kill_only_once)) {
+- /* Subprocess may be dead already. Only need the timeout if not. */
+- if (ap_os_kill(p->pid, SIGTERM) == -1) {
+- p->kill_how = kill_never;
+- }
+- else {
+- need_timeout = 1;
+- }
++ /* Dead subprocesses still need a waitpid to remove the zombie
++ * so we have to ignore errors returned by ap_os_kill()
++ */
++ ap_os_kill(p->pid, SIGTERM);
++ need_timeout = 1;
+ }
+ else if (p->kill_how == kill_always) {
+ kill(p->pid, SIGKILL);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.159 -r1.160 apache.spec
--- openpkg-src/apache/apache.spec 23 Jul 2003 13:31:42 -0000 1.159
+++ openpkg-src/apache/apache.spec 29 Jul 2003 13:31:01 -0000 1.160
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20030723
+Release: 20030729
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5898 -r1.5899 news.txt
--- openpkg-web/news.txt 29 Jul 2003 11:49:31 -0000 1.5898
+++ openpkg-web/news.txt 29 Jul 2003 13:31:00 -0000 1.5899
@@ -1,3 +1,4 @@
+29-Jul-2003: Upgraded package: P<apache-1.3.28-20030729>
29-Jul-2003: Upgraded package: P<qt-3.2.0-20030729>
29-Jul-2003: Upgraded package: P<tsmc-5.1.6.2-20030729>
29-Jul-2003: Upgraded package: P<vim-6.2.57-1.20030729>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
