aboutsummaryrefslogtreecommitdiffstats
path: root/russian/apache13-modssl/files
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2003-10-23 20:14:17 +0800
committerlev <lev@FreeBSD.org>2003-10-23 20:14:17 +0800
commite8c8d32040c6edfb08df1eeeba13fd636a9564e9 (patch)
treedcc224f740223d20d16df7382aadf70eb26d7425 /russian/apache13-modssl/files
parentaca113375144868ee0c20b4486fb4e62efa07982 (diff)
downloadfreebsd-ports-gnome-e8c8d32040c6edfb08df1eeeba13fd636a9564e9.tar.gz
freebsd-ports-gnome-e8c8d32040c6edfb08df1eeeba13fd636a9564e9.tar.zst
freebsd-ports-gnome-e8c8d32040c6edfb08df1eeeba13fd636a9564e9.zip
Fix problem with zombies.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21737
Diffstat (limited to 'russian/apache13-modssl/files')
-rw-r--r--russian/apache13-modssl/files/patch-src::main::alloc.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/russian/apache13-modssl/files/patch-src::main::alloc.c b/russian/apache13-modssl/files/patch-src::main::alloc.c
new file mode 100644
index 000000000000..08ab0e343b75
--- /dev/null
+++ b/russian/apache13-modssl/files/patch-src::main::alloc.c
@@ -0,0 +1,25 @@
+Index: src/main/alloc.c
+===================================================================
+RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
+retrieving revision 1.145
+retrieving revision 1.146
+diff -u -r1.145 -r1.146
+--- src/main/alloc.c 20 Jun 2003 15:05:40 -0000 1.145
++++ src/main/alloc.c 2 Sep 2003 18:17:05 -0000 1.146
+@@ -2859,12 +2859,10 @@
+ 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;
+- }
++ if ( (ap_os_kill(p->pid, SIGTERM) == -1) && (errno == ESRCH) )
++ p->kill_how = kill_never;
++ else
++ need_timeout = 1;
+ }
+ else if (p->kill_how == kill_always) {
+ kill(p->pid, SIGKILL);