summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2005-09-15 14:17:47 +0000
committerjorton <jorton@fedoraproject.org>2005-09-15 14:17:47 +0000
commit0f8eb18ad209cfb5b5a0e2498d19d895dbc6ec73 (patch)
tree9381caa486be207e30fce2c4b5ca5f17b66730b9
parent9f7341dd01e513c8864968cbf9ba0cc49f4b3bb2 (diff)
downloadhttpd-0f8eb18ad209cfb5b5a0e2498d19d895dbc6ec73.tar.gz
httpd-0f8eb18ad209cfb5b5a0e2498d19d895dbc6ec73.tar.xz
httpd-0f8eb18ad209cfb5b5a0e2498d19d895dbc6ec73.zip
- don't load by default: mod_cern_meta, mod_asis
- do load by default: mod_ext_filter (#165893)
-rw-r--r--httpd.conf9
-rw-r--r--httpd.spec11
2 files changed, 14 insertions, 6 deletions
diff --git a/httpd.conf b/httpd.conf
index 481cc65..df95086 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -155,8 +155,8 @@ LoadModule include_module modules/mod_include.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule logio_module modules/mod_logio.so
LoadModule env_module modules/mod_env.so
+LoadModule ext_filter_module modules/mod_ext_filter.so
LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule cern_meta_module modules/mod_cern_meta.so
LoadModule expires_module modules/mod_expires.so
LoadModule deflate_module modules/mod_deflate.so
LoadModule headers_module modules/mod_headers.so
@@ -166,7 +166,6 @@ LoadModule mime_module modules/mod_mime.so
LoadModule dav_module modules/mod_dav.so
LoadModule status_module modules/mod_status.so
LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule asis_module modules/mod_asis.so
LoadModule info_module modules/mod_info.so
LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule vhost_alias_module modules/mod_vhost_alias.so
@@ -189,6 +188,12 @@ LoadModule mem_cache_module modules/mod_mem_cache.so
LoadModule cgi_module modules/mod_cgi.so
#
+# The following modules are not loaded by default:
+#
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule asis_module modules/mod_asis.so
+
+#
# Load config files from the config directory "/etc/httpd/conf.d".
#
Include conf.d/*.conf
diff --git a/httpd.spec b/httpd.spec
index 2cb8611..061b65d 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.0.54
-Release: 12
+Release: 13
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -86,9 +86,8 @@ Obsoletes: mod_put, mod_roaming
Conflicts: pcre < 4.0
%description
-The Apache HTTP Server is a powerful, full-featured, efficient, and
-freely-available Web server. The Apache HTTP Server is also the
-most popular Web server on the Internet.
+The Apache HTTP Server is a powerful, efficient, and extensible
+web server.
%package devel
Group: Development/Libraries
@@ -543,6 +542,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/libtool
%changelog
+* Sat Aug 13 2005 Joe Orton <jorton@redhat.com> 2.0.54-13
+- don't load by default: mod_cern_meta, mod_asis
+- do load by default: mod_ext_filter (#165893)
+
* Thu Jul 28 2005 Joe Orton <jorton@redhat.com> 2.0.54-12
- drop broken epoch deps