details: https://hg.nginx.org/nginx/rev/be82e72c9af8
branches:
changeset: 7832:be82e72c9af8
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu May 06 02:22:07 2021 +0300
description:
Auth basic: changed alcf->user_file to be a pointer.

This saves some memory in typical case when auth_basic_user_file is not
explicitly set, and unifies the code with alcf->realm.

diffstat:

src/http/modules/ngx_http_auth_basic_module.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r bdd4d89370a7 -r be82e72c9af8 src/http/modules/ngx_http_auth_basic_module.c
--- a/src/http/modules/ngx_http_auth_basic_module.c Thu May 06 02:22:03 2021 +0300
+++ b/src/http/modules/ngx_http_auth_basic_module.c Thu May 06 02:22:07 2021 +0300
@@ -16,7 +16,7 @@

typedef struct {
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;


@@ -107,7 +107,7 @@ ngx_http_auth_basic_handler(ngx_http_req

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;
}

@@ -133,7 +133,7 @@ ngx_http_auth_basic_handler(ngx_http_req
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;
}

@@ -358,6 +358,7 @@ ngx_http_auth_basic_create_loc_conf(ngx_
}

conf->realm = NGX_CONF_UNSET_PTR;
+ conf->user_file = NGX_CONF_UNSET_PTR;

return conf;
}
@@ -370,10 +371,7 @@ ngx_http_auth_basic_merge_loc_conf(ngx_c
ngx_http_auth_basic_loc_conf_t *conf = child;

ngx_conf_merge_ptr_value(conf->realm, prev->realm, NULL);
-
- if (conf->user_file.value.data == NULL) {
- conf->user_file = prev->user_file;
- }
+ ngx_conf_merge_ptr_value(conf->user_file, prev->user_file, NULL);

return NGX_CONF_OK;
}
@@ -406,17 +404,22 @@ ngx_http_auth_basic_user_file(ngx_conf_t
ngx_str_t *value;
ngx_http_compile_complex_value_t ccv;

- if (alcf->user_file.value.data) {
+ if (alcf->user_file != NGX_CONF_UNSET_PTR) {
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;

ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));

ccv.cf = cf;
ccv.value = &value[1];
- ccv.complex_value = &alcf->user_file;
+ ccv.complex_value = alcf->user_file;
ccv.zero = 1;
ccv.conf_prefix = 1;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel