Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_flv_module.c @ 390:0b6053502c55 NGINX_0_7_7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.7 *) Change: now the EAGAIN error returned by connect() is not considered as temporary error. *) Change: now the $ssl_client_cert variable value is a certificate with TAB character intended before each line except first one; an unchanged certificate is available in the $ssl_client_raw_cert variable. *) Feature: the "ask" parameter in the "ssl_verify_client" directive. *) Feature: byte-range processing improvements. Thanks to Maxim Dounin. *) Feature: the "directio" directive. *) Feature: MacOSX 1.5 sendfile() support. *) Bugfix: now in MacOSX and Cygwin locations are tested in case insensitive mode; however, the compare is provided by single-byte locales only. *) Bugfix: mail proxy SSL connections hanged, if select, poll, or /dev/poll methods were used. *) Bugfix: UTF-8 encoding usage in the ngx_http_autoindex_module.
author Igor Sysoev <http://sysoev.ru>
date Wed, 30 Jul 2008 00:00:00 +0400
parents 6de24473fa70
children 79c5df00501e
comparison
equal deleted inserted replaced
389:930e48a26dde 390:0b6053502c55
105 105
106 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 106 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
107 107
108 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); 108 ngx_memzero(&of, sizeof(ngx_open_file_info_t));
109 109
110 of.directio = clcf->directio;
110 of.valid = clcf->open_file_cache_valid; 111 of.valid = clcf->open_file_cache_valid;
111 of.min_uses = clcf->open_file_cache_min_uses; 112 of.min_uses = clcf->open_file_cache_min_uses;
112 of.errors = clcf->open_file_cache_errors; 113 of.errors = clcf->open_file_cache_errors;
113 of.events = clcf->open_file_cache_events; 114 of.events = clcf->open_file_cache_events;
114 115
210 b->last = ngx_flv_header + sizeof(ngx_flv_header) - 1; 211 b->last = ngx_flv_header + sizeof(ngx_flv_header) - 1;
211 b->memory = 1; 212 b->memory = 1;
212 213
213 out[0].buf = b; 214 out[0].buf = b;
214 out[0].next = &out[1]; 215 out[0].next = &out[1];
215
216 } else {
217 r->allow_ranges = 1;
218 } 216 }
219 217
220 218
221 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); 219 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
222 if (b == NULL) { 220 if (b == NULL) {
225 223
226 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)); 224 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t));
227 if (b->file == NULL) { 225 if (b->file == NULL) {
228 return NGX_HTTP_INTERNAL_SERVER_ERROR; 226 return NGX_HTTP_INTERNAL_SERVER_ERROR;
229 } 227 }
228
229 r->allow_ranges = 1;
230 230
231 rc = ngx_http_send_header(r); 231 rc = ngx_http_send_header(r);
232 232
233 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { 233 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
234 return rc; 234 return rc;