diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-03-22 10:41:29 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-03-22 10:41:29 +0000 |
| commit | dc863179a39c1e3927f0bcafad04018c0b763c2b (patch) | |
| tree | 10e5fc66575156b4aefe14ddca459d0a3830e8b8 /src | |
| parent | fd601af84c1cb1e9111ac7f4b56cbfb87988217f (diff) | |
| download | nginx-dc863179a39c1e3927f0bcafad04018c0b763c2b.tar.gz nginx-dc863179a39c1e3927f0bcafad04018c0b763c2b.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 6dcc38be8..f0ba7c705 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -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, |