diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-08-06 05:31:08 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-08-06 05:31:08 +0000 |
| commit | 4d6b99ec16254bc2f40324397672b0ad07298088 (patch) | |
| tree | 81d956a72751ad801ea5f8a2bfdf1581aef94123 /www | |
| parent | - Pass correct CPPFLAGS and LDFLAGS to configure for libiconv and libintl. (diff) | |
- Fix SUEXEC leaving zombies behind
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21737
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=105952652425849&w=2
Suggested by: efortenb@sdccd.cc.ca.us
Notes
Notes:
svn path=/head/; revision=86363
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13-modssl/Makefile | 1 | ||||
| -rw-r--r-- | www/apache13-modssl/files/patch-alloc.c | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index eca2b519293c..30fb04655e24 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL} +PORTREVISION= 1 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_MODSSL:S/$/:modssl/} diff --git a/www/apache13-modssl/files/patch-alloc.c b/www/apache13-modssl/files/patch-alloc.c new file mode 100644 index 000000000000..eb8d34e4a193 --- /dev/null +++ b/www/apache13-modssl/files/patch-alloc.c @@ -0,0 +1,20 @@ +RCS file: /e/apache/cvs/apache-1.3/src/main/alloc.c,v +retrieving revision 1.145 +diff -u -d -r1.145 alloc.c +--- src/main/alloc.c 20 Jun 2003 15:05:40 -0000 1.145 ++++ src/main/alloc.c 29 Jul 2003 19:07:46 -0000 +@@ -2859,12 +2859,8 @@ + 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; +- } ++ ap_os_kill(p->pid, SIGTERM); ++ need_timeout = 1; + } + else if (p->kill_how == kill_always) { + kill(p->pid, SIGKILL); |