[nginx] svn commit: r4552 - trunk/src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-03-22 10:41:29 +0000 (Thu, 22 Mar 2012)
New Revision: 4552
URL: http://trac.nginx.org/nginx/changeset/4552/nginx

Log:
Removed safari from keepalive_disable default.

The bug in question is likely already fixed (though unfortunately we have
no information available as Apple's bugtracker isn't open), and the
workaround seems to be too pessimistic for modern versions of Safari
as well as other webkit-based browsers pretending to be Safari.


Modified:
   trunk/src/http/ngx_http_core_module.c

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c	2012-03-21 15:35:05 UTC (rev 4551)
+++ trunk/src/http/ngx_http_core_module.c	2012-03-22 10:41:29 UTC (rev 4552)
@@ -3568,8 +3568,7 @@
     ngx_conf_merge_bitmask_value(conf->keepalive_disable,
                               prev->keepalive_disable,
                               (NGX_CONF_BITMASK_SET
-                               |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6
-                               |NGX_HTTP_KEEPALIVE_DISABLE_SAFARI));
+                               |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6));
     ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
                               NGX_HTTP_SATISFY_ALL);
     ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,