From: Joe Orton <jorton@apache.org>
Date: Tue, 19 Apr 2005 13:09:43 +0000 (+0000)
Subject: * docs/conf/extra/httpd-ssl.conf.in: Don't reference directories which
X-Git-Tag: 2.1.5~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda74843ef73c40b7757609d944af5681de6c2d4;p=thirdparty%2Fapache%2Fhttpd.git

* docs/conf/extra/httpd-ssl.conf.in: Don't reference directories which
aren't created by "make install".  Use BrowserMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161883 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index de4ee9a2d2e..9b181165ee7 100644
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -96,16 +96,16 @@ SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
 #   in mind that if you have both an RSA and a DSA certificate you
 #   can configure both in parallel (to also allow the use of DSA
 #   ciphers, etc.)
-SSLCertificateFile @exp_sysconfdir@/ssl.crt/server.crt
-#SSLCertificateFile @exp_sysconfdir@/ssl.crt/server-dsa.crt
+SSLCertificateFile @exp_sysconfdir@/server.crt
+#SSLCertificateFile @exp_sysconfdir@/server-dsa.crt
 
 #   Server Private Key:
 #   If the key is not combined with the certificate, use this
 #   directive to point at the key file.  Keep in mind that if
 #   you've both a RSA and a DSA private key you can configure
 #   both in parallel (to also allow the use of DSA ciphers, etc.)
-SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key
-#SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server-dsa.key
+SSLCertificateKeyFile @exp_sysconfdir@/server.key
+#SSLCertificateKeyFile @exp_sysconfdir@/server-dsa.key
 
 #   Server Certificate Chain:
 #   Point SSLCertificateChainFile at a file containing the
@@ -114,7 +114,7 @@ SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key
 #   the referenced file can be the same as SSLCertificateFile
 #   when the CA certificates are directly appended to the server
 #   certificate for convinience.
-#SSLCertificateChainFile @exp_sysconfdir@/ssl.crt/ca.crt
+#SSLCertificateChainFile @exp_sysconfdir@/server-ca.crt
 
 #   Certificate Authority (CA):
 #   Set the CA certificate verification path where to find CA
@@ -218,7 +218,7 @@ SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key
 #   Similarly, one has to force some clients to use HTTP/1.0 to workaround
 #   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
 #   "force-response-1.0" for this.
-SetEnvIf User-Agent ".*MSIE.*" \
+BrowserMatch ".*MSIE.*" \
          nokeepalive ssl-unclean-shutdown \
          downgrade-1.0 force-response-1.0