summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2017-08-31 00:42:16 +0300
committerIgor Sysoev <igor@sysoev.ru>2017-08-31 00:42:16 +0300
commitf0e9e3ace94c82fab78ab1d4ee8c3042f3e94fdf (patch)
tree74fab38d3799598febc98aaabb0f5902d7dc5a0e /src
parent61606835448554a7ee9a4431d732e1f2a9318376 (diff)
downloadunit-f0e9e3ace94c82fab78ab1d4ee8c3042f3e94fdf.tar.gz
unit-f0e9e3ace94c82fab78ab1d4ee8c3042f3e94fdf.tar.bz2
nginext has been renamed to unit.
Diffstat (limited to 'src')
-rw-r--r--src/go/unit/cbytes-1.6.go (renamed from src/nginext/cbytes-1.6.go)2
-rw-r--r--src/go/unit/cbytes-1.7.go (renamed from src/nginext/cbytes-1.7.go)2
-rw-r--r--src/go/unit/nxt_go_array.c (renamed from src/nginext/nxt_go_array.c)0
-rw-r--r--src/go/unit/nxt_go_array.h (renamed from src/nginext/nxt_go_array.h)0
-rw-r--r--src/go/unit/nxt_go_lib.c (renamed from src/nginext/nxt_go_lib.c)0
-rw-r--r--src/go/unit/nxt_go_lib.h (renamed from src/nginext/nxt_go_lib.h)0
-rw-r--r--src/go/unit/nxt_go_log.h (renamed from src/nginext/nxt_go_log.h)0
-rw-r--r--src/go/unit/nxt_go_mutex.h (renamed from src/nginext/nxt_go_mutex.h)0
-rw-r--r--src/go/unit/nxt_go_port.c (renamed from src/nginext/nxt_go_port.c)0
-rw-r--r--src/go/unit/nxt_go_port.h (renamed from src/nginext/nxt_go_port.h)0
-rw-r--r--src/go/unit/nxt_go_port_memory.c (renamed from src/nginext/nxt_go_port_memory.c)2
-rw-r--r--src/go/unit/nxt_go_port_memory.h (renamed from src/nginext/nxt_go_port_memory.h)0
-rw-r--r--src/go/unit/nxt_go_process.c (renamed from src/nginext/nxt_go_process.c)0
-rw-r--r--src/go/unit/nxt_go_process.h (renamed from src/nginext/nxt_go_process.h)0
-rw-r--r--src/go/unit/nxt_go_run_ctx.c (renamed from src/nginext/nxt_go_run_ctx.c)0
-rw-r--r--src/go/unit/nxt_go_run_ctx.h (renamed from src/nginext/nxt_go_run_ctx.h)0
-rw-r--r--src/go/unit/port.go (renamed from src/nginext/port.go)2
-rw-r--r--src/go/unit/request.go (renamed from src/nginext/request.go)2
-rw-r--r--src/go/unit/response.go (renamed from src/nginext/response.go)2
-rw-r--r--src/go/unit/unit.go (renamed from src/nginext/nginext.go)2
-rw-r--r--src/nxt_controller.c4
-rw-r--r--src/nxt_main.c4
-rw-r--r--src/nxt_main_process.c2
-rw-r--r--src/nxt_php_sapi.c6
-rw-r--r--src/nxt_port_memory.c2
-rw-r--r--src/nxt_process.c2
-rw-r--r--src/nxt_python_wsgi.c10
-rw-r--r--src/nxt_runtime.c10
28 files changed, 27 insertions, 27 deletions
diff --git a/src/nginext/cbytes-1.6.go b/src/go/unit/cbytes-1.6.go
index 7686dad8..f756b1de 100644
--- a/src/nginext/cbytes-1.6.go
+++ b/src/go/unit/cbytes-1.6.go
@@ -5,7 +5,7 @@
* Copyright (C) NGINX, Inc.
*/
-package nginext
+package unit
import "C"
import "unsafe"
diff --git a/src/nginext/cbytes-1.7.go b/src/go/unit/cbytes-1.7.go
index e7d92f04..e0de283d 100644
--- a/src/nginext/cbytes-1.7.go
+++ b/src/go/unit/cbytes-1.7.go
@@ -5,7 +5,7 @@
* Copyright (C) NGINX, Inc.
*/
-package nginext
+package unit
import "C"
import "unsafe"
diff --git a/src/nginext/nxt_go_array.c b/src/go/unit/nxt_go_array.c
index f409cb10..f409cb10 100644
--- a/src/nginext/nxt_go_array.c
+++ b/src/go/unit/nxt_go_array.c
diff --git a/src/nginext/nxt_go_array.h b/src/go/unit/nxt_go_array.h
index d96db663..d96db663 100644
--- a/src/nginext/nxt_go_array.h
+++ b/src/go/unit/nxt_go_array.h
diff --git a/src/nginext/nxt_go_lib.c b/src/go/unit/nxt_go_lib.c
index 474d313b..474d313b 100644
--- a/src/nginext/nxt_go_lib.c
+++ b/src/go/unit/nxt_go_lib.c
diff --git a/src/nginext/nxt_go_lib.h b/src/go/unit/nxt_go_lib.h
index b3a86be9..b3a86be9 100644
--- a/src/nginext/nxt_go_lib.h
+++ b/src/go/unit/nxt_go_lib.h
diff --git a/src/nginext/nxt_go_log.h b/src/go/unit/nxt_go_log.h
index d596cfb3..d596cfb3 100644
--- a/src/nginext/nxt_go_log.h
+++ b/src/go/unit/nxt_go_log.h
diff --git a/src/nginext/nxt_go_mutex.h b/src/go/unit/nxt_go_mutex.h
index 98bd27f0..98bd27f0 100644
--- a/src/nginext/nxt_go_mutex.h
+++ b/src/go/unit/nxt_go_mutex.h
diff --git a/src/nginext/nxt_go_port.c b/src/go/unit/nxt_go_port.c
index a46a33d1..a46a33d1 100644
--- a/src/nginext/nxt_go_port.c
+++ b/src/go/unit/nxt_go_port.c
diff --git a/src/nginext/nxt_go_port.h b/src/go/unit/nxt_go_port.h
index ce9dbcc3..ce9dbcc3 100644
--- a/src/nginext/nxt_go_port.h
+++ b/src/go/unit/nxt_go_port.h
diff --git a/src/nginext/nxt_go_port_memory.c b/src/go/unit/nxt_go_port_memory.c
index dbdf5f73..e63ca16c 100644
--- a/src/nginext/nxt_go_port_memory.c
+++ b/src/go/unit/nxt_go_port_memory.c
@@ -49,7 +49,7 @@ nxt_go_new_port_mmap(nxt_go_process_t *process, nxt_port_id_t id)
return NULL;
}
- name_len = snprintf(name, sizeof(name) - 1, "/nginext.go.%p", name);
+ name_len = snprintf(name, sizeof(name) - 1, "/unit.go.%p", name);
#if (NXT_HAVE_MEMFD_CREATE)
fd = syscall(SYS_memfd_create, name, MFD_CLOEXEC);
diff --git a/src/nginext/nxt_go_port_memory.h b/src/go/unit/nxt_go_port_memory.h
index f6fe94e3..f6fe94e3 100644
--- a/src/nginext/nxt_go_port_memory.h
+++ b/src/go/unit/nxt_go_port_memory.h
diff --git a/src/nginext/nxt_go_process.c b/src/go/unit/nxt_go_process.c
index c7ce052d..c7ce052d 100644
--- a/src/nginext/nxt_go_process.c
+++ b/src/go/unit/nxt_go_process.c
diff --git a/src/nginext/nxt_go_process.h b/src/go/unit/nxt_go_process.h
index 037844ce..037844ce 100644
--- a/src/nginext/nxt_go_process.h
+++ b/src/go/unit/nxt_go_process.h
diff --git a/src/nginext/nxt_go_run_ctx.c b/src/go/unit/nxt_go_run_ctx.c
index cca8273e..cca8273e 100644
--- a/src/nginext/nxt_go_run_ctx.c
+++ b/src/go/unit/nxt_go_run_ctx.c
diff --git a/src/nginext/nxt_go_run_ctx.h b/src/go/unit/nxt_go_run_ctx.h
index a5a972c6..a5a972c6 100644
--- a/src/nginext/nxt_go_run_ctx.h
+++ b/src/go/unit/nxt_go_run_ctx.h
diff --git a/src/nginext/port.go b/src/go/unit/port.go
index 768fbf84..a8faa2a0 100644
--- a/src/nginext/port.go
+++ b/src/go/unit/port.go
@@ -3,7 +3,7 @@
* Copyright (C) NGINX, Inc.
*/
-package nginext
+package unit
/*
#include "nxt_go_lib.h"
diff --git a/src/nginext/request.go b/src/go/unit/request.go
index 1679f1c7..aa6d1145 100644
--- a/src/nginext/request.go
+++ b/src/go/unit/request.go
@@ -3,7 +3,7 @@
* Copyright (C) NGINX, Inc.
*/
-package nginext
+package unit
/*
#include "nxt_go_lib.h"
diff --git a/src/nginext/response.go b/src/go/unit/response.go
index dc864f6e..18daa2f3 100644
--- a/src/nginext/response.go
+++ b/src/go/unit/response.go
@@ -3,7 +3,7 @@
* Copyright (C) NGINX, Inc.
*/
-package nginext
+package unit
/*
#include "nxt_go_lib.h"
diff --git a/src/nginext/nginext.go b/src/go/unit/unit.go
index 895d6b28..74e53ecf 100644
--- a/src/nginext/nginext.go
+++ b/src/go/unit/unit.go
@@ -3,7 +3,7 @@
* Copyright (C) NGINX, Inc.
*/
-package nginext
+package unit
/*
#include "nxt_go_lib.h"
diff --git a/src/nxt_controller.c b/src/nxt_controller.c
index 74142c2e..7305b3d5 100644
--- a/src/nxt_controller.c
+++ b/src/nxt_controller.c
@@ -1076,7 +1076,7 @@ nxt_controller_response(nxt_task_t *task, nxt_controller_request_t *req,
body->mem.free = nxt_cpymem(body->mem.free, "\r\n", 2);
size = sizeof("HTTP/1.1 " "\r\n") - 1 + status_line.length
- + sizeof("Server: nginext/0.1\r\n") - 1
+ + sizeof("Server: unit/" NXT_VERSION "\r\n") - 1
+ sizeof("Date: Wed, 31 Dec 1986 16:40:00 GMT\r\n") - 1
+ sizeof("Content-Type: application/json\r\n") - 1
+ sizeof("Content-Length: " "\r\n") - 1 + NXT_SIZE_T_LEN
@@ -1098,7 +1098,7 @@ nxt_controller_response(nxt_task_t *task, nxt_controller_request_t *req,
status_line.length);
nxt_str_set(&str, "\r\n"
- "Server: nginext/0.1\r\n"
+ "Server: unit/" NXT_VERSION "\r\n"
"Date: ");
b->mem.free = nxt_cpymem(b->mem.free, str.start, str.length);
diff --git a/src/nxt_main.c b/src/nxt_main.c
index 6f7aec39..03403991 100644
--- a/src/nxt_main.c
+++ b/src/nxt_main.c
@@ -16,7 +16,7 @@ main(int argc, char **argv)
{
nxt_int_t ret;
- if (nxt_lib_start("nginext", argv, &environ) != NXT_OK) {
+ if (nxt_lib_start("unit", argv, &environ) != NXT_OK) {
return 1;
}
@@ -30,7 +30,7 @@ main(int argc, char **argv)
return 1;
}
- nxt_log(&nxt_main_task, NXT_LOG_INFO, "nginext started");
+ nxt_log(&nxt_main_task, NXT_LOG_INFO, "unit started");
nxt_event_engine_start(nxt_main_task.thread->engine);
diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c
index 4043d026..34fc7ea0 100644
--- a/src/nxt_main_process.c
+++ b/src/nxt_main_process.c
@@ -270,7 +270,7 @@ nxt_main_process_title(nxt_task_t *task)
end = title + sizeof(title) - 1;
- p = nxt_sprintf(title, end, "nginext: main [%s", nxt_process_argv[0]);
+ p = nxt_sprintf(title, end, "unit: main [%s", nxt_process_argv[0]);
for (i = 1; nxt_process_argv[i] != NULL; i++) {
p = nxt_sprintf(p, end, " %s", nxt_process_argv[i]);
diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
index 5655dcbc..cb2f6458 100644
--- a/src/nxt_php_sapi.c
+++ b/src/nxt_php_sapi.c
@@ -59,7 +59,7 @@ static void nxt_php_flush(void *server_context);
static sapi_module_struct nxt_php_sapi_module =
{
(char *) "cli-server",
- (char *) "nginext",
+ (char *) "unit",
nxt_php_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
@@ -497,13 +497,13 @@ nxt_php_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
static const u_char default_repsonse[]
= "HTTP/1.1 200 OK\r\n"
- "Server: nginext/0.1\r\n"
+ "Server: unit/" NXT_VERSION "\r\n"
"Content-Type: text/html; charset=UTF-8\r\n"
"Connection: close\r\n"
"\r\n";
static const u_char default_headers[]
- = "Server: nginext/0.1\r\n"
+ - "Server: unit/" NXT_VERSION "\r\n"
"Connection: close\r\n";
static const u_char http_11[] = "HTTP/1.1 ";
diff --git a/src/nxt_port_memory.c b/src/nxt_port_memory.c
index afb2f4a4..7cdd7c58 100644
--- a/src/nxt_port_memory.c
+++ b/src/nxt_port_memory.c
@@ -236,7 +236,7 @@ nxt_port_new_port_mmap(nxt_task_t *task, nxt_process_t *process,
return NULL;
}
- p = nxt_sprintf(name, name + sizeof(name), "/nginext.%PI.%uxD",
+ p = nxt_sprintf(name, name + sizeof(name), "/unit.%PI.%uxD",
nxt_pid, nxt_random(&task->thread->random));
*p = '\0';
diff --git a/src/nxt_process.c b/src/nxt_process.c
index 473e45ea..f7430e5a 100644
--- a/src/nxt_process.c
+++ b/src/nxt_process.c
@@ -104,7 +104,7 @@ nxt_process_start(nxt_task_t *task, nxt_process_t *process)
nxt_log(task, NXT_LOG_INFO, "%s started", init->name);
- nxt_process_title(task, "nginext: %s", init->name);
+ nxt_process_title(task, "unit: %s", init->name);
thread = task->thread;
diff --git a/src/nxt_python_wsgi.c b/src/nxt_python_wsgi.c
index fd718a95..6c188066 100644
--- a/src/nxt_python_wsgi.c
+++ b/src/nxt_python_wsgi.c
@@ -107,7 +107,7 @@ NXT_EXPORT nxt_application_module_t nxt_app_module = {
static PyMethodDef nxt_py_start_resp_method[] = {
- {"nginext_start_response", nxt_py_start_resp, METH_VARARGS, ""}
+ {"unit_start_response", nxt_py_start_resp, METH_VARARGS, ""}
};
@@ -121,7 +121,7 @@ static PyMethodDef nxt_py_input_methods[] = {
static PyTypeObject nxt_py_input_type = {
PyVarObject_HEAD_INIT(NULL, 0)
- "nginext._input", /* tp_name */
+ "unit._input", /* tp_name */
(int) sizeof(nxt_py_input_t), /* tp_basicsize */
0, /* tp_itemsize */
(destructor) nxt_py_input_dealloc, /* tp_dealloc */
@@ -140,7 +140,7 @@ static PyTypeObject nxt_py_input_type = {
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
- "nginext input object.", /* tp_doc */
+ "unit input object.", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
@@ -247,7 +247,7 @@ nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
nxt_py_environ_ptyp = obj;
- obj = Py_BuildValue("[s]", "nginext");
+ obj = Py_BuildValue("[s]", "unit");
if (obj == NULL) {
nxt_log_alert(task->log,
"Python failed to create the \"sys.argv\" list");
@@ -730,7 +730,7 @@ nxt_py_start_resp(PyObject *self, PyObject *args)
static const u_char resp[] = "HTTP/1.1 ";
static const u_char default_headers[]
- = "Server: nginext/0.1\r\n"
+ = "Server: unit/" NXT_VERSION "\r\n"
"Connection: close\r\n";
static const u_char cr_lf[] = "\r\n";
diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c
index cdaa72b6..d9dfa3a5 100644
--- a/src/nxt_runtime.c
+++ b/src/nxt_runtime.c
@@ -763,7 +763,7 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt)
slash = "/";
}
- ret = nxt_file_name_create(rt->mem_pool, &file_name, "%s%snginext.*%Z",
+ ret = nxt_file_name_create(rt->mem_pool, &file_name, "%s%sunit.*%Z",
rt->modules, slash);
if (nxt_slow_path(ret != NXT_OK)) {
return NXT_ERROR;
@@ -797,7 +797,7 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
u_char buf[1024];
static const char version[] =
- "nginext version: " NXT_VERSION "\n"
+ "unit version: " NXT_VERSION "\n"
"configured as ./configure" NXT_CONFIGURE_OPTIONS "\n";
static const char no_control[] =
@@ -811,11 +811,11 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
static const char help[] =
"\n"
- "nginext options:\n"
+ "unit options:\n"
"\n"
- " --version print nginext version and configure options\n"
+ " --version print unit version and configure options\n"
"\n"
- " --no-daemon run nginext in non-daemon mode\n"
+ " --no-daemon run unit in non-daemon mode\n"
"\n"
" --control ADDRESS set address of control API socket\n"
" default: \"" NXT_CONTROL_SOCK "\"\n"