Skip to content

Evaluates variables in mogilefs_domain directive. #4

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Evaluates variables in mogilefs_domain directive. #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ca7b2e
Allow variables for "mogilefs_domain", also make the directive mandat…
Apr 17, 2011
daf4b76
Fix -Werror=unused-but-set-variable warnings with newer gcc
gnosek Nov 3, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 59 additions & 15 deletions ngx_http_mogilefs_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ typedef struct ngx_http_mogilefs_loc_conf_s {
ngx_http_upstream_conf_t upstream;
ngx_array_t *tracker_lengths;
ngx_array_t *tracker_values;
ngx_str_t domain;
ngx_http_complex_value_t *domain_complex;
ngx_array_t *class_templates;
ngx_str_t fetch_location;
ngx_flag_t noverify;
Expand Down Expand Up @@ -130,6 +130,8 @@ static ngx_int_t ngx_http_mogilefs_add_variables(ngx_conf_t *cf);
static char *
ngx_http_mogilefs_tracker_command(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static char *
ngx_http_mogilefs_domain_command(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static char *
ngx_http_mogilefs_class_command(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static char *
ngx_http_mogilefs_pass_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
Expand Down Expand Up @@ -182,9 +184,9 @@ static ngx_command_t ngx_http_mogilefs_commands[] = {

{ ngx_string("mogilefs_domain"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
ngx_http_mogilefs_domain_command,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_mogilefs_loc_conf_t, domain),
offsetof(ngx_http_mogilefs_loc_conf_t, domain_complex),
NULL },

{ ngx_string("mogilefs_connect_timeout"),
Expand Down Expand Up @@ -742,7 +744,10 @@ ngx_http_mogilefs_create_request(ngx_http_request_t *r)
ngx_buf_t *b;
ngx_chain_t *cl;
ngx_http_mogilefs_loc_conf_t *mgcf;
ngx_str_t request, domain;
#if NGX_DEBUG
ngx_str_t request;
#endif
ngx_str_t domain;
ngx_http_mogilefs_ctx_t *ctx;
ngx_http_mogilefs_aux_param_t *a;
ngx_uint_t i;
Expand Down Expand Up @@ -780,13 +785,10 @@ ngx_http_mogilefs_create_request(ngx_http_request_t *r)
return NGX_HTTP_BAD_REQUEST;
}

if(mgcf->parent != NULL) {
domain.len = mgcf->parent->domain.len;
domain.data = mgcf->parent->domain.data;
}
else {
domain.len = mgcf->domain.len;
domain.data = mgcf->domain.data;
rc = ngx_http_complex_value(r, mgcf->parent != NULL ? mgcf->parent->domain_complex : mgcf->domain_complex, &domain);

if(rc == NGX_ERROR) {
return rc;
}

rc = ngx_http_mogilefs_eval_class(r, mgcf->parent != NULL ? mgcf->parent : mgcf);
Expand Down Expand Up @@ -869,11 +871,13 @@ ngx_http_mogilefs_create_request(ngx_http_request_t *r)
}
}

#if NGX_DEBUG
request.data = b->pos;
request.len = b->last - b->pos;

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"mogilefs request: \"%V\"", &request);
#endif

*b->last++ = CR; *b->last++ = LF;

Expand Down Expand Up @@ -1360,7 +1364,9 @@ ngx_http_mogilefs_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->upstream.upstream = prev->upstream.upstream;
}

ngx_conf_merge_str_value(conf->domain, prev->domain, "default");
if (conf->domain_complex == NULL) {
conf->domain_complex = prev->domain_complex;
}

ngx_conf_merge_value(conf->noverify, prev->noverify, 0);

Expand Down Expand Up @@ -1473,6 +1479,42 @@ ngx_http_mogilefs_tracker_command(ngx_conf_t *cf, ngx_command_t *cmd, void *conf
return NGX_CONF_OK;
}

static char *
ngx_http_mogilefs_domain_command(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf)
{
char *p = conf;

ngx_str_t *value;
ngx_http_complex_value_t **cv;
ngx_http_compile_complex_value_t ccv;

cv = (ngx_http_complex_value_t **) (p + cmd->offset);

if (*cv != NULL) {
return "duplicate";
}

*cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
if (*cv == 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 = *cv;

if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
return NGX_CONF_ERROR;
}

return NGX_CONF_OK;
}

static char *
ngx_http_mogilefs_class_command(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
Expand Down Expand Up @@ -1535,7 +1577,7 @@ ngx_http_mogilefs_create_spare_location(ngx_conf_t *cf, ngx_http_conf_ctx_t **oc
ngx_uint_t i;
ngx_http_module_t *module;
void *mconf;
ngx_http_core_loc_conf_t *clcf, *pclcf, *rclcf;
ngx_http_core_loc_conf_t *clcf, *rclcf;
ngx_http_core_srv_conf_t *cscf;

ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));
Expand Down Expand Up @@ -1570,8 +1612,6 @@ ngx_http_mogilefs_create_spare_location(ngx_conf_t *cf, ngx_http_conf_ctx_t **oc
}
}

pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];

clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];

mgcf = ctx->loc_conf[ngx_http_mogilefs_module.ctx_index];
Expand Down Expand Up @@ -1652,6 +1692,10 @@ ngx_http_mogilefs_pass_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return "no tracker defined";
}

if (pmgcf->domain_complex == NULL) {
return "no domain defined";
}

for(i=0;i < NGX_MOGILEFS_MAX_PATHS;i++) {
name.data = ngx_http_mogilefs_path.data;
name.len = ngx_http_mogilefs_path.len - 1;
Expand Down