details: https://hg.nginx.org/njs/rev/63f8aa50e03a
branches:
changeset: 1622:63f8aa50e03a
user: Dmitry Volyntsev <xeioex@nginx.com>
date: Sat Mar 27 16:21:21 2021 +0000
description:
Modules: added js_var directive.

diffstat:

nginx/ngx_http_js_module.c | 99 ++++++++++++++++++++++++++++++++++++++++-
nginx/ngx_stream_js_module.c | 102 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 194 insertions(+), 7 deletions(-)

diffs (304 lines):

diff -r 309e073c873d -r 63f8aa50e03a nginx/ngx_http_js_module.c
--- a/nginx/ngx_http_js_module.c Sat Mar 27 16:45:52 2021 +0000
+++ b/nginx/ngx_http_js_module.c Sat Mar 27 16:21:21 2021 +0000
@@ -86,7 +86,9 @@ static void ngx_http_js_content_write_ev
static void ngx_http_js_content_finalize(ngx_http_request_t *r,
ngx_http_js_ctx_t *ctx);
static ngx_int_t ngx_http_js_header_filter(ngx_http_request_t *r);
-static ngx_int_t ngx_http_js_variable(ngx_http_request_t *r,
+static ngx_int_t ngx_http_js_variable_set(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_js_variable_var(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_js_init_vm(ngx_http_request_t *r);
static void ngx_http_js_cleanup_ctx(void *data);
@@ -209,6 +211,7 @@ static char *ngx_http_js_include(ngx_con
static char *ngx_http_js_import(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
static char *ngx_http_js_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static char *ngx_http_js_var(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static char *ngx_http_js_content(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
static char *ngx_http_js_body_filter_set(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -250,6 +253,13 @@ static ngx_command_t ngx_http_js_comman
0,
NULL },

+ { ngx_string("js_var"),
+ NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE12,
+ ngx_http_js_var,
+ 0,
+ 0,
+ NULL },
+
{ ngx_string("js_content"),
NGX_HTTP_LOC_CONF|NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1,
ngx_http_js_content,
@@ -968,7 +978,7 @@ ngx_http_js_body_filter(ngx_http_request


static ngx_int_t
-ngx_http_js_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+ngx_http_js_variable_set(ngx_http_request_t *r, ngx_http_variable_value_t *v,
uintptr_t data)
{
ngx_str_t *fname = (ngx_str_t *) data;
@@ -1024,6 +1034,33 @@ ngx_http_js_variable(ngx_http_request_t


static ngx_int_t
+ngx_http_js_variable_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+ uintptr_t data)
+{
+ ngx_http_complex_value_t *cv = (ngx_http_complex_value_t *) data;
+
+ ngx_str_t value;
+
+ if (cv != NULL) {
+ if (ngx_http_complex_value(r, cv, &value) != NGX_OK) {
+ return NGX_ERROR;
+ }
+
+ } else {
+ ngx_str_null(&value);
+ }
+
+ v->len = value.len;
+ v->valid = 1;
+ v->no_cacheable = 0;
+ v->not_found = 0;
+ v->data = value.data;
+
+ return NGX_OK;
+}
+
+
+static ngx_int_t
ngx_http_js_init_vm(ngx_http_request_t *r)
{
njs_int_t rc;
@@ -3735,7 +3772,7 @@ ngx_http_js_set(ngx_conf_t *cf, ngx_comm

*fname = value[2];

- v->get_handler = ngx_http_js_variable;
+ v->get_handler = ngx_http_js_variable_set;
v->data = (uintptr_t) fname;

return NGX_CONF_OK;
@@ -3743,6 +3780,62 @@ ngx_http_js_set(ngx_conf_t *cf, ngx_comm


static char *
+ngx_http_js_var(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+ ngx_str_t *value;
+ ngx_int_t index;
+ ngx_http_variable_t *v;
+ ngx_http_complex_value_t *cv;
+ ngx_http_compile_complex_value_t ccv;
+
+ value = cf->args->elts;
+
+ if (value[1].data[0] != '$') {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "invalid variable name \"%V\"", &value[1]);
+ return NGX_CONF_ERROR;
+ }
+
+ value[1].len--;
+ value[1].data++;
+
+ v = ngx_http_add_variable(cf, &value[1], NGX_HTTP_VAR_CHANGEABLE);
+ if (v == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ index = ngx_http_get_variable_index(cf, &value[1]);
+ if (index == NGX_ERROR) {
+ return NGX_CONF_ERROR;
+ }
+
+ cv = NULL;
+
+ if (cf->args->nelts == 3) {
+ cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+ if (cv == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+ ccv.cf = cf;
+ ccv.value = &value[2];
+ ccv.complex_value = cv;
+
+ if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+ return NGX_CONF_ERROR;
+ }
+ }
+
+ v->get_handler = ngx_http_js_variable_var;
+ v->data = (uintptr_t) cv;
+
+ return NGX_CONF_OK;
+}
+
+
+static char *
ngx_http_js_content(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_http_js_loc_conf_t *jlcf = conf;
diff -r 309e073c873d -r 63f8aa50e03a nginx/ngx_stream_js_module.c
--- a/nginx/ngx_stream_js_module.c Sat Mar 27 16:45:52 2021 +0000
+++ b/nginx/ngx_stream_js_module.c Sat Mar 27 16:21:21 2021 +0000
@@ -75,7 +75,9 @@ static ngx_int_t ngx_stream_js_phase_han
ngx_str_t *name);
static ngx_int_t ngx_stream_js_body_filter(ngx_stream_session_t *s,
ngx_chain_t *in, ngx_uint_t from_upstream);
-static ngx_int_t ngx_stream_js_variable(ngx_stream_session_t *s,
+static ngx_int_t ngx_stream_js_variable_set(ngx_stream_session_t *s,
+ ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_js_variable_var(ngx_stream_session_t *s,
ngx_stream_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_stream_js_init_vm(ngx_stream_session_t *s);
static void ngx_stream_js_drop_events(ngx_stream_js_ctx_t *ctx);
@@ -123,6 +125,8 @@ static char *ngx_stream_js_import(ngx_co
void *conf);
static char *ngx_stream_js_set(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
+static char *ngx_stream_js_var(ngx_conf_t *cf, ngx_command_t *cmd,
+ void *conf);
static void *ngx_stream_js_create_main_conf(ngx_conf_t *cf);
static char *ngx_stream_js_init_main_conf(ngx_conf_t *cf, void *conf);
static void *ngx_stream_js_create_srv_conf(ngx_conf_t *cf);
@@ -161,6 +165,13 @@ static ngx_command_t ngx_stream_js_comm
0,
NULL },

+ { ngx_string("js_var"),
+ NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE12,
+ ngx_stream_js_var,
+ 0,
+ 0,
+ NULL },
+
{ ngx_string("js_access"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
@@ -612,8 +623,8 @@ ngx_stream_js_body_filter(ngx_stream_ses


static ngx_int_t
-ngx_stream_js_variable(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
- uintptr_t data)
+ngx_stream_js_variable_set(ngx_stream_session_t *s,
+ ngx_stream_variable_value_t *v, uintptr_t data)
{
ngx_str_t *fname = (ngx_str_t *) data;

@@ -668,6 +679,33 @@ ngx_stream_js_variable(ngx_stream_sessio


static ngx_int_t
+ngx_stream_js_variable_var(ngx_stream_session_t *s,
+ ngx_stream_variable_value_t *v, uintptr_t data)
+{
+ ngx_stream_complex_value_t *cv = (ngx_stream_complex_value_t *) data;
+
+ ngx_str_t value;
+
+ if (cv != NULL) {
+ if (ngx_stream_complex_value(s, cv, &value) != NGX_OK) {
+ return NGX_ERROR;
+ }
+
+ } else {
+ ngx_str_null(&value);
+ }
+
+ v->len = value.len;
+ v->valid = 1;
+ v->no_cacheable = 0;
+ v->not_found = 0;
+ v->data = value.data;
+
+ return NGX_OK;
+}
+
+
+static ngx_int_t
ngx_stream_js_init_vm(ngx_stream_session_t *s)
{
njs_int_t rc;
@@ -1737,13 +1775,69 @@ ngx_stream_js_set(ngx_conf_t *cf, ngx_co

*fname = value[2];

- v->get_handler = ngx_stream_js_variable;
+ v->get_handler = ngx_stream_js_variable_set;
v->data = (uintptr_t) fname;

return NGX_CONF_OK;
}


+static char *
+ngx_stream_js_var(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+ ngx_str_t *value;
+ ngx_int_t index;
+ ngx_stream_variable_t *v;
+ ngx_stream_complex_value_t *cv;
+ ngx_stream_compile_complex_value_t ccv;
+
+ value = cf->args->elts;
+
+ if (value[1].data[0] != '$') {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "invalid variable name \"%V\"", &value[1]);
+ return NGX_CONF_ERROR;
+ }
+
+ value[1].len--;
+ value[1].data++;
+
+ v = ngx_stream_add_variable(cf, &value[1], NGX_STREAM_VAR_CHANGEABLE);
+ if (v == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ index = ngx_stream_get_variable_index(cf, &value[1]);
+ if (index == NGX_ERROR) {
+ return NGX_CONF_ERROR;
+ }
+
+ cv = NULL;
+
+ if (cf->args->nelts == 3) {
+ cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
+ if (cv == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+ ccv.cf = cf;
+ ccv.value = &value[2];
+ ccv.complex_value = cv;
+
+ if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+ return NGX_CONF_ERROR;
+ }
+ }
+
+ v->get_handler = ngx_stream_js_variable_var;
+ v->data = (uintptr_t) cv;
+
+ return NGX_CONF_OK;
+}
+
+
static void *
ngx_stream_js_create_main_conf(ngx_conf_t *cf)
{
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel