Merged with the default branch.1.30.0-1

1 files changed, 87 insertions, 17 deletions

diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index 537a3fb7..8c75a9fe 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -7,6 +7,7 @@
 #include <nxt_main.h>
 #include <nxt_conf.h>
 #include <nxt_cert.h>
+#include <nxt_script.h>
 #include <nxt_router.h>
 #include <nxt_http.h>
 #include <nxt_sockaddr.h>
@@ -226,6 +227,13 @@ static nxt_int_t nxt_conf_vldt_cgroup_path(nxt_conf_validation_t *vldt,
     nxt_conf_value_t *value, void *data);
 #endif
 
+#if (NXT_HAVE_NJS)
+static nxt_int_t nxt_conf_vldt_js_module(nxt_conf_validation_t *vldt,
+     nxt_conf_value_t *value, void *data);
+static nxt_int_t nxt_conf_vldt_js_module_element(nxt_conf_validation_t *vldt,
+    nxt_conf_value_t *value);
+#endif
+
 
 static nxt_conf_vldt_object_t  nxt_conf_vldt_setting_members[];
 static nxt_conf_vldt_object_t  nxt_conf_vldt_http_members[];
@@ -297,6 +305,12 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_setting_members[] = {
         .type       = NXT_CONF_VLDT_OBJECT,
         .validator  = nxt_conf_vldt_object,
         .u.members  = nxt_conf_vldt_http_members,
+#if (NXT_HAVE_NJS)
+    }, {
+        .name       = nxt_string("js_module"),
+        .type       = NXT_CONF_VLDT_STRING | NXT_CONF_VLDT_ARRAY,
+        .validator  = nxt_conf_vldt_js_module,
+#endif
     },
 
     NXT_CONF_VLDT_END
@@ -344,6 +358,12 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_http_members[] = {
         .type       = NXT_CONF_VLDT_OBJECT,
         .validator  = nxt_conf_vldt_object,
         .u.members  = nxt_conf_vldt_static_members,
+    }, {
+        .name       = nxt_string("log_route"),
+        .type       = NXT_CONF_VLDT_BOOLEAN,
+    }, {
+        .name       = nxt_string("server_version"),
+        .type       = NXT_CONF_VLDT_BOOLEAN,
     },
 
     NXT_CONF_VLDT_END
@@ -663,6 +683,16 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_match_members[] = {
 };
 
 
+static nxt_conf_vldt_object_t  nxt_conf_vldt_action_common_members[] = {
+    {
+        .name       = nxt_string("rewrite"),
+        .type       = NXT_CONF_VLDT_STRING,
+    },
+
+    NXT_CONF_VLDT_END
+};
+
+
 static nxt_conf_vldt_object_t  nxt_conf_vldt_pass_action_members[] = {
     {
         .name       = nxt_string("pass"),
@@ -671,7 +701,7 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_pass_action_members[] = {
         .flags      = NXT_CONF_VLDT_TSTR,
     },
 
-    NXT_CONF_VLDT_END
+    NXT_CONF_VLDT_NEXT(nxt_conf_vldt_action_common_members)
 };
 
 
@@ -686,7 +716,7 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_return_action_members[] = {
         .flags      = NXT_CONF_VLDT_TSTR,
     },
 
-    NXT_CONF_VLDT_END
+    NXT_CONF_VLDT_NEXT(nxt_conf_vldt_action_common_members)
 };
 
 
@@ -730,7 +760,7 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_share_action_members[] = {
 #endif
     },
 
-    NXT_CONF_VLDT_END
+    NXT_CONF_VLDT_NEXT(nxt_conf_vldt_action_common_members)
 };
 
 
@@ -741,7 +771,7 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_proxy_action_members[] = {
         .validator  = nxt_conf_vldt_proxy,
     },
 
-    NXT_CONF_VLDT_END
+    NXT_CONF_VLDT_NEXT(nxt_conf_vldt_action_common_members)
 };
 
 
@@ -1044,6 +1074,12 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_common_members[] = {
         .type       = NXT_CONF_VLDT_OBJECT,
         .validator  = nxt_conf_vldt_isolation,
         .u.members  = nxt_conf_vldt_app_isolation_members,
+    }, {
+        .name       = nxt_string("stdout"),
+        .type       = NXT_CONF_VLDT_STRING,
+    }, {
+        .name       = nxt_string("stderr"),
+        .type       = NXT_CONF_VLDT_STRING,
     },
 
     NXT_CONF_VLDT_END
@@ -1284,35 +1320,26 @@ nxt_conf_validate(nxt_conf_validation_t *vldt)
 
     vldt->tstr_state = nxt_tstr_state_new(vldt->pool, 1);
     if (nxt_slow_path(vldt->tstr_state == NULL)) {
-        ret = NXT_ERROR;
-        goto fail;
+        return NXT_ERROR;
     }
 
     ret = nxt_conf_vldt_type(vldt, NULL, vldt->conf, NXT_CONF_VLDT_OBJECT);
     if (ret != NXT_OK) {
-        goto fail;
+        return ret;
     }
 
     ret = nxt_conf_vldt_object(vldt, vldt->conf, nxt_conf_vldt_root_members);
     if (ret != NXT_OK) {
-        goto fail;
+        return ret;
     }
 
     ret = nxt_tstr_state_done(vldt->tstr_state, error);
     if (ret != NXT_OK) {
         ret = nxt_conf_vldt_error(vldt, "%s", error);
-        goto fail;
+        return ret;
     }
 
-    nxt_tstr_state_release(vldt->tstr_state);
-
     return NXT_OK;
-
-fail:
-
-    nxt_tstr_state_release(vldt->tstr_state);
-
-    return ret;
 }
 
 
@@ -3219,6 +3246,49 @@ nxt_conf_vldt_server_weight(nxt_conf_validation_t *vldt,
 }
 
 
+#if (NXT_HAVE_NJS)
+
+static nxt_int_t
+nxt_conf_vldt_js_module(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
+    void *data)
+{
+    if (nxt_conf_type(value) == NXT_CONF_ARRAY) {
+        return nxt_conf_vldt_array_iterator(vldt, value,
+                                            &nxt_conf_vldt_js_module_element);
+    }
+
+    /* NXT_CONF_STRING */
+
+    return nxt_conf_vldt_js_module_element(vldt, value);
+}
+
+
+static nxt_int_t
+nxt_conf_vldt_js_module_element(nxt_conf_validation_t *vldt,
+    nxt_conf_value_t *value)
+{
+    nxt_str_t         name;
+    nxt_conf_value_t  *module;
+
+    if (nxt_conf_type(value) != NXT_CONF_STRING) {
+        return nxt_conf_vldt_error(vldt, "The \"js_module\" array must "
+                                   "contain only string values.");
+    }
+
+    nxt_conf_get_string(value, &name);
+
+    module = nxt_script_info_get(&name);
+    if (module == NULL) {
+        return nxt_conf_vldt_error(vldt, "JS module \"%V\" is not found.",
+                                   &name);
+    }
+
+    return NXT_OK;
+}
+
+#endif
+
+
 typedef struct {
     nxt_str_t  path;
     nxt_str_t  format;