Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 158:d377ee423603

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-10-24-10:53:41 import
author Igor Sysoev <igor@sysoev.ru>
date Fri, 24 Oct 2003 06:53:41 +0000
parents 46eb23d9471d
children 981e4af2a425
comparison
equal deleted inserted replaced
157:70b36c805682 158:d377ee423603
161 {ngx_string("lingering_timeout"), 161 {ngx_string("lingering_timeout"),
162 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 162 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
163 ngx_conf_set_msec_slot, 163 ngx_conf_set_msec_slot,
164 NGX_HTTP_LOC_CONF_OFFSET, 164 NGX_HTTP_LOC_CONF_OFFSET,
165 offsetof(ngx_http_core_loc_conf_t, lingering_timeout), 165 offsetof(ngx_http_core_loc_conf_t, lingering_timeout),
166 NULL},
167
168 {ngx_string("msie_padding"),
169 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
170 ngx_conf_set_flag_slot,
171 NGX_HTTP_LOC_CONF_OFFSET,
172 offsetof(ngx_http_core_loc_conf_t, msie_padding),
166 NULL}, 173 NULL},
167 174
168 {ngx_string("error_log"), 175 {ngx_string("error_log"),
169 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 176 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
170 ngx_set_error_log, 177 ngx_set_error_log,
841 lcf->discarded_buffer_size = NGX_CONF_UNSET; 848 lcf->discarded_buffer_size = NGX_CONF_UNSET;
842 lcf->keepalive_timeout = NGX_CONF_UNSET; 849 lcf->keepalive_timeout = NGX_CONF_UNSET;
843 lcf->lingering_time = NGX_CONF_UNSET; 850 lcf->lingering_time = NGX_CONF_UNSET;
844 lcf->lingering_timeout = NGX_CONF_UNSET; 851 lcf->lingering_timeout = NGX_CONF_UNSET;
845 852
853 lcf->msie_padding = NGX_CONF_UNSET;
854
846 return lcf; 855 return lcf;
847 } 856 }
848 857
849 858
850 static ngx_http_type_t default_types[] = { 859 static ngx_http_type_t default_types[] = {
914 ngx_conf_merge_msec_value(conf->lingering_time, 923 ngx_conf_merge_msec_value(conf->lingering_time,
915 prev->lingering_time, 30000); 924 prev->lingering_time, 30000);
916 ngx_conf_merge_msec_value(conf->lingering_timeout, 925 ngx_conf_merge_msec_value(conf->lingering_timeout,
917 prev->lingering_timeout, 5000); 926 prev->lingering_timeout, 5000);
918 927
928 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
929
919 return NGX_CONF_OK; 930 return NGX_CONF_OK;
920 } 931 }
921 932
922 933
923 static char *ngx_set_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 934 static char *ngx_set_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)