comparison src/http/modules/ngx_http_flv_module.c @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents ff463db0be31
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
78 78
79 if (r->uri.data[r->uri.len - 1] == '/') { 79 if (r->uri.data[r->uri.len - 1] == '/') {
80 return NGX_DECLINED; 80 return NGX_DECLINED;
81 } 81 }
82 82
83 if (r->zero_in_uri) {
84 return NGX_DECLINED;
85 }
86
87 rc = ngx_http_discard_request_body(r); 83 rc = ngx_http_discard_request_body(r);
88 84
89 if (rc != NGX_OK) { 85 if (rc != NGX_OK) {
90 return rc; 86 return rc;
91 } 87 }
104 100
105 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 101 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
106 102
107 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); 103 ngx_memzero(&of, sizeof(ngx_open_file_info_t));
108 104
105 of.read_ahead = clcf->read_ahead;
109 of.directio = clcf->directio; 106 of.directio = clcf->directio;
110 of.valid = clcf->open_file_cache_valid; 107 of.valid = clcf->open_file_cache_valid;
111 of.min_uses = clcf->open_file_cache_min_uses; 108 of.min_uses = clcf->open_file_cache_min_uses;
112 of.errors = clcf->open_file_cache_errors; 109 of.errors = clcf->open_file_cache_errors;
113 of.events = clcf->open_file_cache_events; 110 of.events = clcf->open_file_cache_events;