Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_core_module.c @ 668:9fbf3ad94cbf NGINX_1_1_18
nginx 1.1.18
*) Change: keepalive connections are no longer disabled for Safari by
default.
*) Feature: the $connection_requests variable.
*) Feature: $tcpinfo_rtt, $tcpinfo_rttvar, $tcpinfo_snd_cwnd and
$tcpinfo_rcv_space variables.
*) Feature: the "worker_cpu_affinity" directive now works on FreeBSD.
*) Feature: the "xslt_param" and "xslt_string_param" directives.
Thanks to Samuel Behan.
*) Bugfix: in configure tests.
Thanks to Piotr Sikora.
*) Bugfix: in the ngx_http_xslt_filter_module.
*) Bugfix: nginx could not be built on Debian GNU/Hurd.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 28 Mar 2012 00:00:00 +0400 |
parents | bf8b55a5ac89 |
children | ad45b044f1e5 |
comparison
equal
deleted
inserted
replaced
667:e0eabdb2bad1 | 668:9fbf3ad94cbf |
---|---|
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, |
4645 static char * | 4644 static char * |
4646 ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | 4645 ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
4647 { | 4646 { |
4648 ngx_http_core_loc_conf_t *clcf = conf; | 4647 ngx_http_core_loc_conf_t *clcf = conf; |
4649 | 4648 |
4650 ngx_str_t *value; | 4649 ngx_str_t *value, name; |
4651 | 4650 |
4652 if (clcf->error_log) { | 4651 if (clcf->error_log) { |
4653 return "is duplicate"; | 4652 return "is duplicate"; |
4654 } | 4653 } |
4655 | 4654 |
4656 value = cf->args->elts; | 4655 value = cf->args->elts; |
4657 | 4656 |
4658 clcf->error_log = ngx_log_create(cf->cycle, &value[1]); | 4657 if (ngx_strcmp(value[1].data, "stderr") == 0) { |
4658 ngx_str_null(&name); | |
4659 | |
4660 } else { | |
4661 name = value[1]; | |
4662 } | |
4663 | |
4664 clcf->error_log = ngx_log_create(cf->cycle, &name); | |
4659 if (clcf->error_log == NULL) { | 4665 if (clcf->error_log == NULL) { |
4660 return NGX_CONF_ERROR; | 4666 return NGX_CONF_ERROR; |
4661 } | 4667 } |
4662 | 4668 |
4663 if (cf->args->nelts == 2) { | 4669 if (cf->args->nelts == 2) { |