mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +08:00
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.
This commit is contained in:
parent
fd601af84c
commit
dc863179a3
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user