Mercurial > hg > nginx-vendor-1-0

comparison src/http/modules/ngx_http_mp4_module.c @ 640:97a1e05203c2 NGINX_1_0_10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.10 *) Bugfix: a segmentation fault might occur in a worker process if resolver got a big DNS response. Thanks to Ben Hawkes. *) Bugfix: in cache key calculation if internal MD5 implementation was used; the bug had appeared in 1.0.4. *) Bugfix: the module ngx_http_mp4_module sent incorrect "Content-Length" response header line if the "start" argument was used. Thanks to Piotr Sikora.
author Igor Sysoev <http://sysoev.ru>
date Tue, 15 Nov 2011 00:00:00 +0400
parents 692f4d4d7f10
children 1b80544421e8
comparison
equal deleted inserted replaced
639:6a2ff3b3f4c4 640:97a1e05203c2
1064 uint64_t atom_size; 1064 uint64_t atom_size;
1065 ngx_buf_t *atom; 1065 ngx_buf_t *atom;
1066 1066
1067 atom_data_size = mp4->mdat_data.buf->file_last - start_offset; 1067 atom_data_size = mp4->mdat_data.buf->file_last - start_offset;
1068 mp4->mdat_data.buf->file_pos = start_offset; 1068 mp4->mdat_data.buf->file_pos = start_offset;
1069 mp4->content_length += atom_data_size;
1070 1069
1071 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, 1070 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
1072 "mdat new offset @%O:%O", start_offset, atom_data_size); 1071 "mdat new offset @%O:%O", start_offset, atom_data_size);
1073 1072
1074 atom_header = mp4->mdat_atom_header; 1073 atom_header = mp4->mdat_atom_header;
1080 sizeof(ngx_mp4_atom_header64_t) + atom_data_size); 1079 sizeof(ngx_mp4_atom_header64_t) + atom_data_size);
1081 } else { 1080 } else {
1082 atom_size = sizeof(ngx_mp4_atom_header_t) + atom_data_size; 1081 atom_size = sizeof(ngx_mp4_atom_header_t) + atom_data_size;
1083 atom_header_size = sizeof(ngx_mp4_atom_header_t); 1082 atom_header_size = sizeof(ngx_mp4_atom_header_t);
1084 } 1083 }
1084
1085 mp4->content_length += atom_header_size + atom_data_size;
1085 1086
1086 ngx_mp4_set_32value(atom_header, atom_size); 1087 ngx_mp4_set_32value(atom_header, atom_size);
1087 ngx_mp4_set_atom_name(atom_header, 'm', 'd', 'a', 't'); 1088 ngx_mp4_set_atom_name(atom_header, 'm', 'd', 'a', 't');
1088 1089
1089 atom = &mp4->mdat_atom_buf; 1090 atom = &mp4->mdat_atom_buf;