aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--russian/apache13-modssl/Makefile2
-rw-r--r--russian/apache13-modssl/files/patch-src::main::alloc.c25
-rw-r--r--russian/apache13/Makefile1
-rw-r--r--russian/apache13/files/patch-src::main::alloc.c25
4 files changed, 52 insertions, 1 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 2daebef3ac0a..23a06eee922c 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache+mod_ssl
PORTVERSION= ${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= russian www security
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
${MASTER_SITES_MODSSL:S/$/:modssl/} \
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);
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index 8d31c43bafe2..f57eaab92b09 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -7,6 +7,7 @@
PORTNAME= apache
PORTVERSION= ${APACHE_VERSION}+${RA_VERSION}
+PORTREVISION= 1
CATEGORIES= russian www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= ${PORTNAME}_${APACHE_VERSION}
diff --git a/russian/apache13/files/patch-src::main::alloc.c b/russian/apache13/files/patch-src::main::alloc.c
new file mode 100644
index 000000000000..08ab0e343b75
--- /dev/null
+++ b/russian/apache13/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);