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

Fixed two minor bugs in "types" parsing code.

Browse Source
This commit is contained in:
Ruslan Ermilov 2011-10-12 09:36:21 +00:00
parent b5c3336e3e
commit fc55962698
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/ngx_http_core_module.c
View File

@ -2994,6 +2994,12 @@ ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
value = cf->args->elts;
if (ngx_strcmp(value[0].data, "include") == 0) {
if (cf->args->nelts != 2) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid number of arguments"
" in \"include\" directive");
return NGX_CONF_ERROR;
}
file = value[1];
if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
@ -3027,7 +3033,7 @@ ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
"content type: \"%V\", "
"previous content type: \"%V\"",
&value[i], content_type, old);
continue;
goto next;
}
}
@ -3040,6 +3046,9 @@ ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
type->key = value[i];
type->key_hash = hash;
type->value = content_type;
next:
continue;
}
return NGX_CONF_OK;