This commit is contained in:
Valentin Bartenev
2018-04-05 15:49:41 +03:00
parent 49bd3a21e0
commit d15b4ca906
9 changed files with 30 additions and 27 deletions

View File

@@ -292,10 +292,10 @@ nxt_app_msg_read_length(u_char *src, size_t *length)
src++; src++;
} else { } else {
*length = ((src[0] & 0x7FU) << 24) + *length = ((src[0] & 0x7FU) << 24)
(src[1] << 16) + + ( src[1] << 16)
(src[2] << 8) + + ( src[2] << 8)
src[3]; + src[3];
src += 4; src += 4;
} }

View File

@@ -73,8 +73,8 @@ nxt_buf_mem_ts_alloc(nxt_task_t *task, nxt_mp_t *mp, size_t size)
b->is_ts = 1; b->is_ts = 1;
if (size != 0) { if (size != 0) {
b->mem.start = nxt_pointer_to(b, NXT_BUF_MEM_SIZE + b->mem.start = nxt_pointer_to(b, NXT_BUF_MEM_SIZE
sizeof(nxt_buf_ts_t)); + sizeof(nxt_buf_ts_t));
b->mem.pos = b->mem.start; b->mem.pos = b->mem.start;
b->mem.free = b->mem.start; b->mem.free = b->mem.start;
b->mem.end = b->mem.start + size; b->mem.end = b->mem.start + size;
@@ -304,8 +304,9 @@ nxt_buf_make_plain(nxt_mp_t *mp, nxt_buf_t *src, size_t size)
} }
for (i = src; i != NULL; i = i->next) { for (i = src; i != NULL; i = i->next) {
if (nxt_slow_path(nxt_buf_mem_free_size(&b->mem) < if (nxt_slow_path(nxt_buf_mem_free_size(&b->mem)
nxt_buf_used_size(i))) { < nxt_buf_used_size(i)))
{
break; break;
} }

View File

@@ -444,8 +444,8 @@ space_after_target:
} }
if (rp->exten_start) { if (rp->exten_start) {
rp->exten.length = rp->path.start + rp->path.length - rp->exten.length = rp->path.start + rp->path.length
rp->exten_start; - rp->exten_start;
rp->exten.start = rp->exten_start; rp->exten.start = rp->exten_start;
} }

View File

@@ -329,8 +329,8 @@ nxt_php_read_request(nxt_task_t *task, nxt_app_rmsg_t *rmsg,
script_name.start = NULL; script_name.start = NULL;
} }
ctx->script.length = nxt_php_root.length + h->path.length + ctx->script.length = nxt_php_root.length + h->path.length
script_name.length; + script_name.length;
p = ctx->script.start = nxt_malloc(ctx->script.length + 1); p = ctx->script.start = nxt_malloc(ctx->script.length + 1);
if (nxt_slow_path(p == NULL)) { if (nxt_slow_path(p == NULL)) {
return NXT_ERROR; return NXT_ERROR;

View File

@@ -67,26 +67,26 @@ typedef enum {
_NXT_PORT_MSG_DATA = nxt_port_handler_idx(data), _NXT_PORT_MSG_DATA = nxt_port_handler_idx(data),
NXT_PORT_MSG_MAX = sizeof(nxt_port_handlers_t) / NXT_PORT_MSG_MAX = sizeof(nxt_port_handlers_t)
sizeof(nxt_port_handler_t), / sizeof(nxt_port_handler_t),
NXT_PORT_MSG_RPC_READY = _NXT_PORT_MSG_RPC_READY, NXT_PORT_MSG_RPC_READY = _NXT_PORT_MSG_RPC_READY,
NXT_PORT_MSG_RPC_READY_LAST = _NXT_PORT_MSG_RPC_READY | NXT_PORT_MSG_LAST, NXT_PORT_MSG_RPC_READY_LAST = _NXT_PORT_MSG_RPC_READY | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_RPC_ERROR = _NXT_PORT_MSG_RPC_ERROR | NXT_PORT_MSG_LAST, NXT_PORT_MSG_RPC_ERROR = _NXT_PORT_MSG_RPC_ERROR | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_START_WORKER = _NXT_PORT_MSG_START_WORKER | NXT_PORT_MSG_START_WORKER = _NXT_PORT_MSG_START_WORKER
NXT_PORT_MSG_LAST, | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_SOCKET = _NXT_PORT_MSG_SOCKET | NXT_PORT_MSG_LAST, NXT_PORT_MSG_SOCKET = _NXT_PORT_MSG_SOCKET | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_MODULES = _NXT_PORT_MSG_MODULES | NXT_PORT_MSG_LAST, NXT_PORT_MSG_MODULES = _NXT_PORT_MSG_MODULES | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_CONF_STORE = _NXT_PORT_MSG_CONF_STORE | NXT_PORT_MSG_LAST, NXT_PORT_MSG_CONF_STORE = _NXT_PORT_MSG_CONF_STORE | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_CHANGE_FILE = _NXT_PORT_MSG_CHANGE_FILE | NXT_PORT_MSG_LAST, NXT_PORT_MSG_CHANGE_FILE = _NXT_PORT_MSG_CHANGE_FILE | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_NEW_PORT = _NXT_PORT_MSG_NEW_PORT | NXT_PORT_MSG_LAST, NXT_PORT_MSG_NEW_PORT = _NXT_PORT_MSG_NEW_PORT | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_MMAP = _NXT_PORT_MSG_MMAP | NXT_PORT_MSG_LAST | NXT_PORT_MSG_MMAP = _NXT_PORT_MSG_MMAP | NXT_PORT_MSG_LAST
NXT_PORT_MSG_CLOSE_FD | NXT_PORT_MSG_SYNC, | NXT_PORT_MSG_CLOSE_FD | NXT_PORT_MSG_SYNC,
NXT_PORT_MSG_PROCESS_READY = _NXT_PORT_MSG_PROCESS_READY | NXT_PORT_MSG_PROCESS_READY = _NXT_PORT_MSG_PROCESS_READY
NXT_PORT_MSG_LAST, | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_QUIT = _NXT_PORT_MSG_QUIT | NXT_PORT_MSG_LAST, NXT_PORT_MSG_QUIT = _NXT_PORT_MSG_QUIT | NXT_PORT_MSG_LAST,
NXT_PORT_MSG_REMOVE_PID = _NXT_PORT_MSG_REMOVE_PID | NXT_PORT_MSG_LAST, NXT_PORT_MSG_REMOVE_PID = _NXT_PORT_MSG_REMOVE_PID | NXT_PORT_MSG_LAST,

View File

@@ -20,7 +20,7 @@
nxt_inline void nxt_inline void
nxt_port_mmap_handler_use(nxt_port_mmap_handler_t *mmap_handler, int i) nxt_port_mmap_handler_use(nxt_port_mmap_handler_t *mmap_handler, int i)
{ {
int c; int c;
c = nxt_atomic_fetch_add(&mmap_handler->use_count, i); c = nxt_atomic_fetch_add(&mmap_handler->use_count, i);
@@ -888,7 +888,7 @@ nxt_port_mmap_get_method(nxt_task_t *task, nxt_port_t *port, nxt_buf_t *b)
m = NXT_PORT_METHOD_ANY; m = NXT_PORT_METHOD_ANY;
for (; b != NULL; b = b->next) { for (/* void */; b != NULL; b = b->next) {
if (nxt_buf_used_size(b) == 0) { if (nxt_buf_used_size(b) == 0) {
/* empty buffers does not affect method */ /* empty buffers does not affect method */
continue; continue;

View File

@@ -250,6 +250,7 @@ nxt_port_rpc_remove_from_peers(nxt_task_t *task, nxt_port_t *port,
"registration (%p)", stream, reg->peer, reg->link.next); "registration (%p)", stream, reg->peer, reg->link.next);
ret = nxt_lvlhsh_delete(&port->rpc_peers, &lhq); ret = nxt_lvlhsh_delete(&port->rpc_peers, &lhq);
} else { } else {
nxt_debug(task, "rpc: stream #%uD remove first pid %PI " nxt_debug(task, "rpc: stream #%uD remove first pid %PI "
"registration (%p)", stream, reg->peer, reg->link.next); "registration (%p)", stream, reg->peer, reg->link.next);
@@ -264,6 +265,7 @@ nxt_port_rpc_remove_from_peers(nxt_task_t *task, nxt_port_t *port,
ret = nxt_lvlhsh_insert(&port->rpc_peers, &lhq); ret = nxt_lvlhsh_insert(&port->rpc_peers, &lhq);
} }
} else { } else {
nxt_debug(task, "rpc: stream #%uD remove pid %PI " nxt_debug(task, "rpc: stream #%uD remove pid %PI "
"registration (%p)", stream, reg->peer, reg->link.next); "registration (%p)", stream, reg->peer, reg->link.next);

View File

@@ -118,10 +118,10 @@ nxt_port_write_enable(nxt_task_t *task, nxt_port_t *port)
port->socket.error_handler = nxt_port_error_handler; port->socket.error_handler = nxt_port_error_handler;
if (port->iov == NULL) { if (port->iov == NULL) {
port->iov = nxt_mp_get(port->mem_pool, sizeof(struct iovec) * port->iov = nxt_mp_get(port->mem_pool,
NXT_IOBUF_MAX * 10); sizeof(struct iovec) * NXT_IOBUF_MAX * 10);
port->mmsg_buf = nxt_mp_get(port->mem_pool, sizeof(uint32_t) * 3 * port->mmsg_buf = nxt_mp_get(port->mem_pool,
NXT_IOBUF_MAX * 10); sizeof(uint32_t) * 3 * NXT_IOBUF_MAX * 10);
} }
} }

View File

@@ -21,7 +21,7 @@ static u_char invalid[] = {
3, 0xC0, 0x00, 0x00, 0x00, 3, 0xC0, 0x00, 0x00, 0x00,
4, 0xC0, 0x00, 0x00, 0x00, 4, 0xC0, 0x00, 0x00, 0x00,
/* Invalid 0x0x110000 value. */ /* Invalid 0x110000 value. */
4, 0xF4, 0x90, 0x80, 0x80, 4, 0xF4, 0x90, 0x80, 0x80,
/* Incomplete length. */ /* Incomplete length. */