mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.

Browse Source
This commit is contained in:
Igor Sysoev 2011-09-12 09:38:04 +00:00
parent b1c79a449e
commit e07a3577a9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/modules/ngx_http_mp4_module.c
View File

@ -37,7 +37,7 @@
typedef struct { typedef struct {
size_t buffer_size; size_t buffer_size;
size_t max_moov_size; size_t max_buffer_size;
} ngx_http_mp4_conf_t; } ngx_http_mp4_conf_t;
@ -275,11 +275,11 @@ static ngx_command_t ngx_http_mp4_commands[] = {
offsetof(ngx_http_mp4_conf_t, buffer_size), offsetof(ngx_http_mp4_conf_t, buffer_size),
NULL }, NULL },
{ ngx_string("mp4_max_moov_size"), { ngx_string("mp4_max_buffer_size"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_size_slot, ngx_conf_set_size_slot,
NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_mp4_conf_t, max_moov_size), offsetof(ngx_http_mp4_conf_t, max_buffer_size),
NULL }, NULL },
ngx_null_command ngx_null_command
@ -937,10 +937,10 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
if (atom_data_size > mp4->buffer_size) { if (atom_data_size > mp4->buffer_size) {
if (atom_data_size > conf->max_moov_size) { if (atom_data_size > conf->max_buffer_size) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"\"%s\" mp4 moov atom is too large:%uL, " "\"%s\" mp4 moov atom is too large:%uL, "
"you may want to increase mp4_max_moov_size", "you may want to increase mp4_max_buffer_size",
mp4->file.name.data, atom_data_size); mp4->file.name.data, atom_data_size);
return NGX_ERROR; return NGX_ERROR;
} }
@ -2574,7 +2574,7 @@ ngx_http_mp4_create_conf(ngx_conf_t *cf)
} }
conf->buffer_size = NGX_CONF_UNSET_SIZE; conf->buffer_size = NGX_CONF_UNSET_SIZE;
conf->max_moov_size = NGX_CONF_UNSET_SIZE; conf->max_buffer_size = NGX_CONF_UNSET_SIZE;
return conf; return conf;
} }
@ -2587,7 +2587,7 @@ ngx_http_mp4_merge_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_mp4_conf_t *conf = child; ngx_http_mp4_conf_t *conf = child;
ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 512 * 1024); ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 512 * 1024);
ngx_conf_merge_size_value(conf->max_moov_size, prev->max_moov_size, ngx_conf_merge_size_value(conf->max_buffer_size, prev->max_buffer_size,
10 * 1024 * 1024); 10 * 1024 * 1024);
return NGX_CONF_OK; return NGX_CONF_OK;