]> git.kaiwu.me - nginx.git/commitdiff
Removed safari from keepalive_disable default.
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 22 Mar 2012 10:41:29 +0000 (10:41 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 22 Mar 2012 10:41:29 +0000 (10:41 +0000)
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.

src/http/ngx_http_core_module.c

index 6dcc38be8a8170763655c0559176ec61436a5f7d..f0ba7c7054d5b19fc27d52bbb71b61b47873a580 100644 (file)
@@ -3568,8 +3568,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     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,