Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 162:96993d4d5067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-10-28-00:01:00 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 27 Oct 2003 21:01:00 +0000
parents e7e094d34162
children fb61ba77beba
comparison
equal deleted inserted replaced
161:88abd07d9f62 162:96993d4d5067
126 {ngx_string("root"), 126 {ngx_string("root"),
127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
128 ngx_conf_set_str_slot, 128 ngx_conf_set_str_slot,
129 NGX_HTTP_LOC_CONF_OFFSET, 129 NGX_HTTP_LOC_CONF_OFFSET,
130 offsetof(ngx_http_core_loc_conf_t, doc_root), 130 offsetof(ngx_http_core_loc_conf_t, doc_root),
131 NULL},
132
133 {ngx_string("client_body_timeout"),
134 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
135 ngx_conf_set_msec_slot,
136 NGX_HTTP_LOC_CONF_OFFSET,
137 offsetof(ngx_http_core_loc_conf_t, client_body_timeout),
131 NULL}, 138 NULL},
132 139
133 {ngx_string("sendfile"), 140 {ngx_string("sendfile"),
134 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
135 ngx_conf_set_flag_slot, 142 ngx_conf_set_flag_slot,
840 lcf->default_type.data = NULL; 847 lcf->default_type.data = NULL;
841 lcf->err_log = NULL; 848 lcf->err_log = NULL;
842 849
843 */ 850 */
844 851
852 lcf->client_body_timeout = NGX_CONF_UNSET;
845 lcf->sendfile = NGX_CONF_UNSET; 853 lcf->sendfile = NGX_CONF_UNSET;
846 lcf->send_timeout = NGX_CONF_UNSET; 854 lcf->send_timeout = NGX_CONF_UNSET;
847 lcf->discarded_buffer_size = NGX_CONF_UNSET; 855 lcf->discarded_buffer_size = NGX_CONF_UNSET;
848 lcf->keepalive_timeout = NGX_CONF_UNSET; 856 lcf->keepalive_timeout = NGX_CONF_UNSET;
849 lcf->lingering_time = NGX_CONF_UNSET; 857 lcf->lingering_time = NGX_CONF_UNSET;
911 } 919 }
912 920
913 ngx_conf_merge_str_value(conf->default_type, 921 ngx_conf_merge_str_value(conf->default_type,
914 prev->default_type, "text/plain"); 922 prev->default_type, "text/plain");
915 923
924 ngx_conf_merge_msec_value(conf->client_body_timeout,
925 prev->client_body_timeout, 10000);
916 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); 926 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
917 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 10000); 927 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 10000);
918 ngx_conf_merge_size_value(conf->discarded_buffer_size, 928 ngx_conf_merge_size_value(conf->discarded_buffer_size,
919 prev->discarded_buffer_size, 1500); 929 prev->discarded_buffer_size, 1500);
920 ngx_conf_merge_msec_value(conf->keepalive_timeout, 930 ngx_conf_merge_msec_value(conf->keepalive_timeout,