aboutsummaryrefslogtreecommitdiffstats
path: root/www/apache22
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2013-01-02 10:12:16 +0800
committerache <ache@FreeBSD.org>2013-01-02 10:12:16 +0800
commit910b699ee82636cec6c5c1b68c7ccb93e722e661 (patch)
tree96f73f3a94163ba2b0fcd87bccfd11d4e2de99d4 /www/apache22
parenteec88796b5711bc52501c21fa5523e849b2ccccd (diff)
downloadfreebsd-ports-gnome-910b699ee82636cec6c5c1b68c7ccb93e722e661.tar.gz
freebsd-ports-gnome-910b699ee82636cec6c5c1b68c7ccb93e722e661.tar.zst
freebsd-ports-gnome-910b699ee82636cec6c5c1b68c7ccb93e722e661.zip
Use
LockFile "/var/run/accept.lock" instead of previous LockFile "/var/log/accept.lock" If system is crashed and rebooted, Apache refuses to start in case /var/log/accept.lock.<pid> is found. That <pid> is almost always the same due to minimum pid variance right after boot. So use /var/run instead, which is cleaned on each boot.
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in11
2 files changed, 12 insertions, 1 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 02a23abe614d..012b136eaeb9 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -2,7 +2,7 @@
PORTNAME= apache22
PORTVERSION= 2.2.23
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= httpd-${PORTVERSION}
diff --git a/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in b/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in
new file mode 100644
index 000000000000..079cc48946bf
--- /dev/null
+++ b/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in
@@ -0,0 +1,11 @@
+--- docs/conf/extra/httpd-mpm.conf.in.bak 2007-12-29 06:08:28.000000000 +0300
++++ docs/conf/extra/httpd-mpm.conf.in 2013-01-02 05:58:13.000000000 +0400
+@@ -17,7 +17,7 @@
+ #
+ <IfModule !mpm_winnt_module>
+ <IfModule !mpm_netware_module>
+-LockFile "@rel_logfiledir@/accept.lock"
++LockFile "@rel_runtimedir@/accept.lock"
+ </IfModule>
+ </IfModule>
+