Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 4551:22e613ba0925
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 22 Mar 2012 10:41:29 +0000 |
parents | 2e7ac96049b8 |
children | a1d5842064f7 |
comparison
equal
deleted
inserted
replaced
4550:d29dc0486e8e | 4551:22e613ba0925 |
---|---|
3566 prev->client_body_timeout, 60000); | 3566 prev->client_body_timeout, 60000); |
3567 | 3567 |
3568 ngx_conf_merge_bitmask_value(conf->keepalive_disable, | 3568 ngx_conf_merge_bitmask_value(conf->keepalive_disable, |
3569 prev->keepalive_disable, | 3569 prev->keepalive_disable, |
3570 (NGX_CONF_BITMASK_SET | 3570 (NGX_CONF_BITMASK_SET |
3571 |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 | 3571 |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6)); |
3572 |NGX_HTTP_KEEPALIVE_DISABLE_SAFARI)); | |
3573 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, | 3572 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, |
3574 NGX_HTTP_SATISFY_ALL); | 3573 NGX_HTTP_SATISFY_ALL); |
3575 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, | 3574 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, |
3576 NGX_HTTP_IMS_EXACT); | 3575 NGX_HTTP_IMS_EXACT); |
3577 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges, | 3576 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges, |