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

Auth basic: changed alcf->user_file to be a pointer.

Browse Source 
This saves some memory in typical case when auth_basic_user_file is not
explicitly set, and unifies the code with alcf->realm.
This commit is contained in:
Maxim Dounin 2021-05-06 02:22:07 +03:00
parent 4faa840853
commit a6bce8c227
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/http/modules/ngx_http_auth_basic_module.c
View File

@ -16,7 +16,7 @@
typedef struct { typedef struct {
ngx_http_complex_value_t *realm; ngx_http_complex_value_t *realm;
ngx_http_complex_value_t user_file; ngx_http_complex_value_t *user_file;
} ngx_http_auth_basic_loc_conf_t; } ngx_http_auth_basic_loc_conf_t;
@ -107,7 +107,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
alcf = ngx_http_get_module_loc_conf(r, ngx_http_auth_basic_module); alcf = ngx_http_get_module_loc_conf(r, ngx_http_auth_basic_module);
if (alcf->realm == NULL || alcf->user_file.value.data == NULL) { if (alcf->realm == NULL || alcf->user_file == NULL) {
return NGX_DECLINED; return NGX_DECLINED;
} }
@ -133,7 +133,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
if (ngx_http_complex_value(r, &alcf->user_file, &user_file) != NGX_OK) { if (ngx_http_complex_value(r, alcf->user_file, &user_file) != NGX_OK) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -358,6 +358,7 @@ ngx_http_auth_basic_create_loc_conf(ngx_conf_t *cf)
} }
conf->realm = NGX_CONF_UNSET_PTR; conf->realm = NGX_CONF_UNSET_PTR;
conf->user_file = NGX_CONF_UNSET_PTR;
return conf; return conf;
} }
@ -370,10 +371,7 @@ ngx_http_auth_basic_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_auth_basic_loc_conf_t *conf = child; ngx_http_auth_basic_loc_conf_t *conf = child;
ngx_conf_merge_ptr_value(conf->realm, prev->realm, NULL); ngx_conf_merge_ptr_value(conf->realm, prev->realm, NULL);
ngx_conf_merge_ptr_value(conf->user_file, prev->user_file, NULL);
if (conf->user_file.value.data == NULL) {
conf->user_file = prev->user_file;
}
return NGX_CONF_OK; return NGX_CONF_OK;
} }
@ -406,17 +404,22 @@ ngx_http_auth_basic_user_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_str_t *value; ngx_str_t *value;
ngx_http_compile_complex_value_t ccv; ngx_http_compile_complex_value_t ccv;
if (alcf->user_file.value.data) { if (alcf->user_file != NGX_CONF_UNSET_PTR) {
return "is duplicate"; return "is duplicate";
} }
alcf->user_file = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
if (alcf->user_file == NULL) {
return NGX_CONF_ERROR;
}
value = cf->args->elts; value = cf->args->elts;
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
ccv.cf = cf; ccv.cf = cf;
ccv.value = &value[1]; ccv.value = &value[1];
ccv.complex_value = &alcf->user_file; ccv.complex_value = alcf->user_file;
ccv.zero = 1; ccv.zero = 1;
ccv.conf_prefix = 1; ccv.conf_prefix = 1;