simono41/ngx_http_geoip2_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support setting default variable value

Browse source
This commit is contained in:
Jiale Zhi 2014-03-19 12:58:41 -07:00
parent 48435ecb0f
commit 80803760cb
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -30,6 +30,7 @@ http {
geoip2_data $geoip2_data_city_name city names en; geoip2_data $geoip2_data_city_name city names en;
geoip2_data $geoip2_data_geoname_id country geoname_id; geoip2_data $geoip2_data_geoname_id country geoname_id;
geoip2_data $geoip2_data_latitude location latitude; geoip2_data $geoip2_data_latitude location latitude;
geoip2_data $geoip2_data_country_code default=US country iso_code;
.... ....
} }
``` ```

29
ngx_http_geoip2_module.c
View file

@ -28,6 +28,7 @@ typedef struct {
typedef struct { typedef struct {
const char **lookup; const char **lookup;
ngx_str_t default_value;
} ngx_http_geoip2_ctx_t; } ngx_http_geoip2_ctx_t;
@ -205,6 +206,16 @@ ngx_http_geoip2_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
return NGX_OK; return NGX_OK;
not_found: not_found:
if (geoip2->default_value.len > 0) {
v->data = geoip2->default_value.data;
v->len = geoip2->default_value.len;
v->valid = 1;
v->no_cacheable = 0;
v->not_found = 0;
return NGX_OK;
}
v->not_found = 1; v->not_found = 1;
return NGX_OK; return NGX_OK;
@ -243,7 +254,11 @@ ngx_http_geoip2_data(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_str_t *value, name; ngx_str_t *value, name;
ngx_http_geoip2_ctx_t *geoip2; ngx_http_geoip2_ctx_t *geoip2;
ngx_http_variable_t *var; ngx_http_variable_t *var;
int i, nelts; int i, nelts, lookup_idx;
char *prefix = "default=";
size_t prefix_len = sizeof("default=") - 1;
printf("prefix len %d", (int)prefix_len);
geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_ctx_t)); geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_ctx_t));
if (geoip2 == NULL) { if (geoip2 == NULL) {
@ -269,13 +284,21 @@ ngx_http_geoip2_data(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
name.len--; name.len--;
name.data++; name.data++;
lookup_idx = 2;
if (nelts > 2 && value[2].len >= prefix_len &&
ngx_strncmp(value[2].data, prefix, prefix_len) == 0) {
geoip2->default_value.len = value[2].len - prefix_len;
geoip2->default_value.data = value[2].data + prefix_len;
lookup_idx++;
}
var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE); var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
if (var == NULL) { if (var == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
for (i = 2; i < nelts; i++) { for (i = lookup_idx; i < nelts; i++) {
geoip2->lookup[i-2] = (char *) value[i].data; geoip2->lookup[i-lookup_idx] = (char *) value[i].data;
} }
geoip2->lookup[i] = NULL; geoip2->lookup[i] = NULL;