rpms/httpd/devel httpd.conf, 1.27, 1.28 httpd.spec, 1.125, 1.126 ssl.conf, 1.10, 1.11

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25819

Modified Files:
	httpd.conf httpd.spec ssl.conf 
Log Message:
* Tue Jul 15 2008 Joe Orton <jorton at redhat.com> 2.2.9-5
- move AddTypes for SSL cert/CRL types from ssl.conf to httpd.conf (#449979)



Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- httpd.conf	14 Jul 2008 14:09:16 -0000	1.27
+++ httpd.conf	15 Jul 2008 13:44:47 -0000	1.28
@@ -767,6 +767,12 @@
 AddType application/x-gzip .gz .tgz
 
 #
+#   MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+#
 # AddHandler allows you to map certain file extensions to "handlers":
 # actions unrelated to filetype. These can be either built into the server
 # or added with the Action directive (see below)


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- httpd.spec	14 Jul 2008 14:18:03 -0000	1.125
+++ httpd.spec	15 Jul 2008 13:44:47 -0000	1.126
@@ -9,7 +9,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.9
-Release: 4
+Release: 5
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -482,6 +482,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Jul 15 2008 Joe Orton <jorton at redhat.com> 2.2.9-5
+- move AddTypes for SSL cert/CRL types from ssl.conf to httpd.conf (#449979)
+
 * Mon Jul 14 2008 Joe Orton <jorton at redhat.com> 2.2.9-4
 - use Charset=UTF-8 in default httpd.conf (#455123)
 - only enable suexec when appropriate (Jim Radford, #453697)


Index: ssl.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/ssl.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ssl.conf	5 Dec 2005 17:26:03 -0000	1.10
+++ ssl.conf	15 Jul 2008 13:44:47 -0000	1.11
@@ -24,12 +24,6 @@
 ##  the main server and all SSL-enabled virtual hosts.
 ##
 
-#
-#   Some MIME-types for downloading Certificates and CRLs
-#
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-
 #   Pass Phrase Dialog:
 #   Configure the pass phrase gathering process.
 #   The filtering dialog program (`builtin' is a internal