-
Notifications
You must be signed in to change notification settings - Fork 105
srcache_store_max_size as complex value type #94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Hello @Flashed . |
if (conf->store_max_size == NULL) { | ||
conf->store_max_size = prev->store_max_size; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (conf->store_max_size == NULL) { | |
conf->store_max_size = prev->store_max_size; | |
} |
@@ -305,7 +304,7 @@ ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |||
ngx_conf_merge_size_value(conf->buf_size, prev->buf_size, | |||
(size_t) ngx_pagesize); | |||
|
|||
ngx_conf_merge_size_value(conf->store_max_size, prev->store_max_size, 0); | |||
ngx_conf_merge_ptr_value(conf->store_max_size, prev->store_max_size, 0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ngx_conf_merge_ptr_value(conf->store_max_size, prev->store_max_size, 0); | |
ngx_conf_merge_ptr_value(conf->store_max_size, prev->store_max_size, NULL); |
@@ -269,7 +269,6 @@ ngx_http_srcache_create_loc_conf(ngx_conf_t *cf) | |||
conf->store = NGX_CONF_UNSET_PTR; | |||
|
|||
conf->buf_size = NGX_CONF_UNSET_SIZE; | |||
conf->store_max_size = NGX_CONF_UNSET_SIZE; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conf->store_max_size = NGX_CONF_UNSET_PTR;
@@ -53,7 +53,7 @@ typedef struct { | |||
ngx_http_srcache_request_t *fetch; | |||
ngx_http_srcache_request_t *store; | |||
size_t buf_size; | |||
size_t store_max_size; | |||
ngx_http_complex_value_t *store_max_size; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ngx_http_complex_value_t *store_max_size; | |
ngx_http_complex_value_t *store_max_size; |
we need to add some test cases to covert the new feature. |
No description provided.