Merged with the default branch.1.5-1

1 files changed, 2 insertions, 16 deletions

diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c
index 311c2c08..547c7494 100644
--- a/src/nxt_runtime.c
+++ b/src/nxt_runtime.c
@@ -80,10 +80,10 @@ nxt_runtime_create(nxt_task_t *task)
 
     /* Should not fail. */
     lang = nxt_array_add(rt->languages);
-    lang->type = NXT_APP_GO;
+    lang->type = NXT_APP_EXTERNAL;
     lang->version = (u_char *) "";
     lang->file = NULL;
-    lang->module = &nxt_go_module;
+    lang->module = &nxt_external_module;
 
     listen_sockets = nxt_array_create(mp, 1, sizeof(nxt_listen_socket_t));
     if (nxt_slow_path(listen_sockets == NULL)) {
@@ -872,20 +872,6 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
             continue;
         }
 
-        if (nxt_strcmp(p, "--upstream") == 0) {
-            if (*argv == NULL) {
-                nxt_alert(task, "no argument for option \"--upstream\"");
-                return NXT_ERROR;
-            }
-
-            p = *argv++;
-
-            rt->upstream.length = nxt_strlen(p);
-            rt->upstream.start = (u_char *) p;
-
-            continue;
-        }
-
         if (nxt_strcmp(p, "--user") == 0) {
             if (*argv == NULL) {
                 write(STDERR_FILENO, no_user, nxt_length(no_user));