[Pkg-apache-commits] r1087 - in /trunk/apache2: README.Debian changelog config-dir/sites-available/default-ssl

[sf at alioth.debian.org]

Author: sf
Date: Sat Nov  7 10:55:13 2009
New Revision: 1087

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1087
Log:
Enable keepalive for MSIE 7 and newer

Modified:
    trunk/apache2/README.Debian
    trunk/apache2/changelog
    trunk/apache2/config-dir/sites-available/default-ssl

Modified: trunk/apache2/README.Debian
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/README.Debian?rev=1087&op=diff
==============================================================================
--- trunk/apache2/README.Debian (original)
+++ trunk/apache2/README.Debian Sat Nov  7 10:55:13 2009
@@ -212,8 +212,10 @@
 VirtualHost section (it was previously in ssl.conf but caused keepalive to be
 disabled even for non-SSL connections):
 
-SetEnvIf User-Agent ".*MSIE.*"  nokeepalive ssl-unclean-shutdown \
-                                downgrade-1.0 force-response-1.0
+	BrowserMatch "MSIE [2-6]" \
+		nokeepalive ssl-unclean-shutdown \
+		downgrade-1.0 force-response-1.0
+	BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
 The default SSL virtual host in /etc/apache2/sites-available/default-ssl
 already contains this workaround.

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1087&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Nov  7 10:55:13 2009
@@ -9,6 +9,7 @@
   * Add X-Interactive header to init script as it may ask for the ssl key
     passphrase. Closes: #554824
   * Move httxt2dbm man page into apache2.2-bin, which includes httxt2dbm, too.
+  * Enable keepalive for MSIE 7 and newer in default-ssl site and README.Debian
 
  -- Stefan Fritsch <sf at debian.org>  Mon, 19 Oct 2009 19:50:11 +0200
 

Modified: trunk/apache2/config-dir/sites-available/default-ssl
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/sites-available/default-ssl?rev=1087&op=diff
==============================================================================
--- trunk/apache2/config-dir/sites-available/default-ssl (original)
+++ trunk/apache2/config-dir/sites-available/default-ssl Sat Nov  7 10:55:13 2009
@@ -162,9 +162,11 @@
 	#   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.
-	BrowserMatch ".*MSIE.*" \
+	BrowserMatch "MSIE [2-6]" \
 		nokeepalive ssl-unclean-shutdown \
 		downgrade-1.0 force-response-1.0
+	# MSIE 7 and newer should be able to use keepalive
+	BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
 </VirtualHost>
 </IfModule>