1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00

Update to version 1.3.29+30.19+2.8.16

This commit is contained in:
Lev A. Serebryakov 2003-11-21 12:15:52 +00:00
parent 5278339f94
commit e1f82681c7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=94633
4 changed files with 10 additions and 33 deletions

View File

@ -7,7 +7,6 @@
PORTNAME= apache+mod_ssl
PORTVERSION= ${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL}
PORTREVISION= 2
CATEGORIES= russian www security
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
${MASTER_SITES_MODSSL:S/$/:modssl/} \
@ -50,9 +49,9 @@ DOCSDIR= ${PREFIX}/share/doc/apache
.include <bsd.port.pre.mk>
VERSION_APACHE= 1.3.28
VERSION_MODSSL= 2.8.15
VERSION_RA= 30.18
VERSION_APACHE= 1.3.29
VERSION_MODSSL= 2.8.16
VERSION_RA= 30.19
#
# some defaults

View File

@ -1,3 +1,3 @@
MD5 (apache_1.3.28.tar.gz) = 2cdece7b4881d541e072de6a2b65db77
MD5 (mod_ssl-2.8.15-1.3.28.tar.gz) = 0f37d6efd51128f696000d73624f5aff
MD5 (patches_1.3.28rusPL30.18.tar.gz) = 1ba4842baf15b42e6a9e6c4929178846
MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3
MD5 (mod_ssl-2.8.16-1.3.29.tar.gz) = 4f6c580ffa07d33e8584406132b98e86
MD5 (patches_1.3.29rusPL30.19.tar.gz) = 58d4c5305cc80cf76d744a9722958320

View File

@ -1,25 +0,0 @@
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);

View File

@ -316,6 +316,7 @@ sbin/rotatelogs
%%DOCSDIR%%/index.html.se
%%DOCSDIR%%/index.html.zh-tw.big5
%%DOCSDIR%%/manual/LICENSE
%%DOCSDIR%%/manual/FAQ.html
%%DOCSDIR%%/manual/bind.html.en
%%DOCSDIR%%/manual/bind.html.fr
%%DOCSDIR%%/manual/bind.html.html
@ -498,7 +499,9 @@ sbin/rotatelogs
%%DOCSDIR%%/manual/mod/mod_negotiation.html.html
%%DOCSDIR%%/manual/mod/mod_negotiation.html.ja.jis
%%DOCSDIR%%/manual/mod/mod_proxy.html
%%DOCSDIR%%/manual/mod/mod_rewrite.html
%%DOCSDIR%%/manual/mod/mod_rewrite.html.en
%%DOCSDIR%%/manual/mod/mod_rewrite.html.html
%%DOCSDIR%%/manual/mod/mod_rewrite.html.ja.jis
%%DOCSDIR%%/manual/mod/mod_setenvif.html.en
%%DOCSDIR%%/manual/mod/mod_setenvif.html.html
%%DOCSDIR%%/manual/mod/mod_setenvif.html.ja.jis