summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2009-03-17 13:09:35 +0000
committerjorton <jorton@fedoraproject.org>2009-03-17 13:09:35 +0000
commit8a37bd4c40e2a4cf25f181e81d75a6fefac371bd (patch)
tree215868f16637e1e6cc99fae85ae89456d859a996
parent377daf4cd8b3551ea1e6f6c3cc48ef5c43c7ec40 (diff)
downloadhttpd-F-11-start.tar.gz
httpd-F-11-start.tar.xz
httpd-F-11-start.zip
- fix pidfile in httpd.logrotate (thanks to Rainer Traut)httpd-2_2_11-8F-11-startF-11-split
- don't build mod_mem_cache or mod_file_cache
-rw-r--r--httpd.conf2
-rw-r--r--httpd.logrotate2
-rw-r--r--httpd.spec10
3 files changed, 8 insertions, 6 deletions
diff --git a/httpd.conf b/httpd.conf
index 2e594aa..b57e80e 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -193,8 +193,6 @@ LoadModule proxy_connect_module modules/mod_proxy_connect.so
LoadModule cache_module modules/mod_cache.so
LoadModule suexec_module modules/mod_suexec.so
LoadModule disk_cache_module modules/mod_disk_cache.so
-LoadModule file_cache_module modules/mod_file_cache.so
-LoadModule mem_cache_module modules/mod_mem_cache.so
LoadModule cgi_module modules/mod_cgi.so
#
diff --git a/httpd.logrotate b/httpd.logrotate
index dd0ce1b..a2529a3 100644
--- a/httpd.logrotate
+++ b/httpd.logrotate
@@ -3,6 +3,6 @@
notifempty
sharedscripts
postrotate
- /bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
endscript
}
diff --git a/httpd.spec b/httpd.spec
index bd2afde..43673bf 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.11
-Release: 7
+Release: 8
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -195,8 +195,8 @@ mpmbuild prefork \
--enable-mods-shared=all \
--enable-ssl --with-ssl --enable-distcache \
--enable-proxy \
- --enable-cache --enable-mem-cache \
- --enable-file-cache --enable-disk-cache \
+ --enable-cache \
+ --enable-disk-cache \
--enable-ldap --enable-authnz-ldap \
--enable-cgid \
--enable-authn-anon --enable-authn-alias \
@@ -482,6 +482,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Tue Mar 17 2009 Joe Orton <jorton@redhat.com> 2.2.11-8
+- fix pidfile in httpd.logrotate (thanks to Rainer Traut)
+- don't build mod_mem_cache or mod_file_cache
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild