Merged with the default branch.1.5-1

1 files changed, 16 insertions, 16 deletions

diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index ca7107cc..b1e30955 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -256,6 +256,21 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_common_members[] = {
 };
 
 
+static nxt_conf_vldt_object_t  nxt_conf_vldt_external_members[] = {
+    { nxt_string("executable"),
+      NXT_CONF_VLDT_STRING,
+      NULL,
+      NULL },
+
+    { nxt_string("arguments"),
+      NXT_CONF_VLDT_ARRAY,
+      &nxt_conf_vldt_array_iterator,
+      (void *) &nxt_conf_vldt_argument },
+
+    NXT_CONF_VLDT_NEXT(&nxt_conf_vldt_common_members)
+};
+
+
 static nxt_conf_vldt_object_t  nxt_conf_vldt_python_members[] = {
     { nxt_string("home"),
       NXT_CONF_VLDT_STRING,
@@ -321,21 +336,6 @@ static nxt_conf_vldt_object_t  nxt_conf_vldt_php_members[] = {
 };
 
 
-static nxt_conf_vldt_object_t  nxt_conf_vldt_go_members[] = {
-    { nxt_string("executable"),
-      NXT_CONF_VLDT_STRING,
-      NULL,
-      NULL },
-
-    { nxt_string("arguments"),
-      NXT_CONF_VLDT_ARRAY,
-      &nxt_conf_vldt_array_iterator,
-      (void *) &nxt_conf_vldt_argument },
-
-    NXT_CONF_VLDT_NEXT(&nxt_conf_vldt_common_members)
-};
-
-
 static nxt_conf_vldt_object_t  nxt_conf_vldt_perl_members[] = {
     { nxt_string("script"),
       NXT_CONF_VLDT_STRING,
@@ -565,9 +565,9 @@ nxt_conf_vldt_app(nxt_conf_validation_t *vldt, nxt_str_t *name,
     static nxt_str_t  type_str = nxt_string("type");
 
     static void  *members[] = {
+        nxt_conf_vldt_external_members,
         nxt_conf_vldt_python_members,
         nxt_conf_vldt_php_members,
-        nxt_conf_vldt_go_members,
         nxt_conf_vldt_perl_members,
         nxt_conf_vldt_ruby_members,
     };