summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/nxt_h1proto.c126
-rw-r--r--src/nxt_http.h2
-rw-r--r--src/nxt_http_request.c25
3 files changed, 127 insertions, 26 deletions
diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c
index 25df8349..c4a848d8 100644
--- a/src/nxt_h1proto.c
+++ b/src/nxt_h1proto.c
@@ -36,7 +36,7 @@ static void nxt_h1p_request_send(nxt_task_t *task, nxt_http_request_t *r,
nxt_buf_t *out);
static nxt_buf_t *nxt_h1p_chunk_create(nxt_task_t *task, nxt_http_request_t *r,
nxt_buf_t *out);
-static void nxt_h1p_conn_request_sent(nxt_task_t *task, void *obj, void *data);
+static void nxt_h1p_conn_sent(nxt_task_t *task, void *obj, void *data);
static nxt_off_t nxt_h1p_request_body_bytes_sent(nxt_task_t *task,
nxt_http_proto_t proto);
static void nxt_h1p_request_discard(nxt_task_t *task, nxt_http_request_t *r,
@@ -46,9 +46,12 @@ static void nxt_h1p_request_close(nxt_task_t *task, nxt_http_proto_t proto,
static void nxt_h1p_keepalive(nxt_task_t *task, nxt_h1proto_t *h1p,
nxt_conn_t *c);
static void nxt_h1p_conn_error(nxt_task_t *task, void *obj, void *data);
-static void nxt_h1p_conn_timeout(nxt_task_t *task, void *obj, void *data);
-static nxt_msec_t nxt_h1p_conn_timeout_value(nxt_conn_t *c,
+static void nxt_h1p_conn_idle_timeout(nxt_task_t *task, void *obj, void *data);
+static void nxt_h1p_conn_idle_close(nxt_task_t *task, void *obj, void *data);
+static void nxt_h1p_conn_send_timeout(nxt_task_t *task, void *obj, void *data);
+static nxt_msec_t nxt_h1p_conn_send_timeout_value(nxt_conn_t *c,
uintptr_t data);
+static nxt_msec_t nxt_h1p_conn_timeout_value(nxt_conn_t *c, uintptr_t data);
static void nxt_h1p_close(nxt_task_t *task, nxt_conn_t *c);
static void nxt_h1p_conn_free(nxt_task_t *task, void *obj, void *data);
static void nxt_h1p_conn_request_error(nxt_task_t *task, void *obj, void *data);
@@ -65,7 +68,8 @@ nxt_inline void nxt_h1p_request_error(nxt_task_t *task, nxt_h1proto_t *h1p,
static const nxt_conn_state_t nxt_h1p_idle_state;
static const nxt_conn_state_t nxt_h1p_header_parse_state;
static const nxt_conn_state_t nxt_h1p_read_body_state;
-static const nxt_conn_state_t nxt_h1p_send_state;
+static const nxt_conn_state_t nxt_h1p_request_send_state;
+static const nxt_conn_state_t nxt_h1p_timeout_send_state;
static const nxt_conn_state_t nxt_h1p_keepalive_state;
static const nxt_conn_state_t nxt_h1p_close_state;
@@ -183,7 +187,7 @@ static const nxt_conn_state_t nxt_h1p_idle_state
.io_read_handler = nxt_h1p_conn_io_read_handler,
- .timer_handler = nxt_h1p_conn_timeout,
+ .timer_handler = nxt_h1p_conn_idle_timeout,
.timer_value = nxt_h1p_conn_timeout_value,
.timer_data = offsetof(nxt_socket_conf_t, idle_timeout),
.timer_autoreset = 1,
@@ -839,7 +843,7 @@ nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r)
c = h1p->conn;
c->write = header;
- c->write_state = &nxt_h1p_send_state;
+ c->write_state = &nxt_h1p_request_send_state;
engine = task->thread->engine;
@@ -850,10 +854,10 @@ nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r)
}
-static const nxt_conn_state_t nxt_h1p_send_state
+static const nxt_conn_state_t nxt_h1p_request_send_state
nxt_aligned(64) =
{
- .ready_handler = nxt_h1p_conn_request_sent,
+ .ready_handler = nxt_h1p_conn_sent,
.error_handler = nxt_h1p_conn_request_error,
.timer_handler = nxt_h1p_conn_request_send_timeout,
@@ -884,7 +888,7 @@ nxt_h1p_request_send(nxt_task_t *task, nxt_http_request_t *r, nxt_buf_t *out)
if (c->write == NULL) {
c->write = out;
- c->write_state = &nxt_h1p_send_state;
+ c->write_state = &nxt_h1p_request_send_state;
nxt_conn_write(task->thread->engine, c);
@@ -947,14 +951,14 @@ nxt_h1p_chunk_create(nxt_task_t *task, nxt_http_request_t *r, nxt_buf_t *out)
static void
-nxt_h1p_conn_request_sent(nxt_task_t *task, void *obj, void *data)
+nxt_h1p_conn_sent(nxt_task_t *task, void *obj, void *data)
{
nxt_conn_t *c;
nxt_event_engine_t *engine;
c = obj;
- nxt_debug(task, "h1p conn request sent");
+ nxt_debug(task, "h1p conn sent");
engine = task->thread->engine;
@@ -1097,7 +1101,7 @@ static const nxt_conn_state_t nxt_h1p_keepalive_state
.io_read_handler = nxt_h1p_conn_io_read_handler,
- .timer_handler = nxt_h1p_conn_timeout,
+ .timer_handler = nxt_h1p_conn_idle_timeout,
.timer_value = nxt_h1p_conn_timeout_value,
.timer_data = offsetof(nxt_socket_conf_t, idle_timeout),
.timer_autoreset = 1,
@@ -1117,15 +1121,102 @@ nxt_h1p_conn_error(nxt_task_t *task, void *obj, void *data)
}
+#define NXT_H1P_IDLE_TIMEOUT \
+ "HTTP/1.1 408 Request Timeout\r\n" \
+ "Server: " NXT_SERVER "\r\n" \
+ "Connection: close\r\n" \
+ "Content-Length: 0\r\n" \
+ "Date: "
+
+
+static void
+nxt_h1p_conn_idle_timeout(nxt_task_t *task, void *obj, void *data)
+{
+ u_char *p;
+ size_t size;
+ nxt_buf_t *out, *last;
+ nxt_conn_t *c;
+ nxt_timer_t *timer;
+
+ timer = obj;
+
+ nxt_debug(task, "h1p conn idle timeout");
+
+ c = nxt_read_timer_conn(timer);
+
+ size = nxt_length(NXT_H1P_IDLE_TIMEOUT)
+ + nxt_http_date_cache.size
+ + nxt_length("\r\n\r\n");
+
+ out = nxt_buf_mem_alloc(c->mem_pool, size, 0);
+ if (nxt_slow_path(out == NULL)) {
+ goto fail;
+ }
+
+ p = nxt_cpymem(out->mem.free, NXT_H1P_IDLE_TIMEOUT,
+ nxt_length(NXT_H1P_IDLE_TIMEOUT));
+
+ p = nxt_thread_time_string(task->thread, &nxt_http_date_cache, p);
+
+ out->mem.free = nxt_cpymem(p, "\r\n\r\n", 4);
+
+ last = nxt_mp_zget(c->mem_pool, NXT_BUF_SYNC_SIZE);
+ if (nxt_slow_path(last == NULL)) {
+ goto fail;
+ }
+
+ out->next = last;
+ nxt_buf_set_sync(last);
+ nxt_buf_set_last(last);
+
+ last->completion_handler = nxt_h1p_conn_idle_close;
+ last->parent = c;
+
+ c->write = out;
+ c->write_state = &nxt_h1p_timeout_send_state;
+
+ nxt_conn_write(task->thread->engine, c);
+ return;
+
+fail:
+
+ nxt_h1p_close(task, c);
+}
+
+
+static const nxt_conn_state_t nxt_h1p_timeout_send_state
+ nxt_aligned(64) =
+{
+ .ready_handler = nxt_h1p_conn_sent,
+ .error_handler = nxt_h1p_conn_error,
+
+ .timer_handler = nxt_h1p_conn_send_timeout,
+ .timer_value = nxt_h1p_conn_send_timeout_value,
+};
+
+
+static void
+nxt_h1p_conn_idle_close(nxt_task_t *task, void *obj, void *data)
+{
+ nxt_conn_t *c;
+
+ c = data;
+
+ nxt_debug(task, "h1p conn idle close");
+
+ nxt_h1p_close(task, c);
+}
+
+
static void
-nxt_h1p_conn_timeout(nxt_task_t *task, void *obj, void *data)
+nxt_h1p_conn_send_timeout(nxt_task_t *task, void *obj, void *data)
{
nxt_conn_t *c;
nxt_timer_t *timer;
timer = obj;
- nxt_debug(task, "h1p conn timeout");
+ nxt_debug(task, "h1p conn send timeout");
c = nxt_read_timer_conn(timer);
@@ -1134,6 +1225,13 @@ nxt_h1p_conn_timeout(nxt_task_t *task, void *obj, void *data)
static nxt_msec_t
+nxt_h1p_conn_send_timeout_value(nxt_conn_t *c, uintptr_t data)
+{
+ return 10 * 1000;
+}
+
+
+static nxt_msec_t
nxt_h1p_conn_timeout_value(nxt_conn_t *c, uintptr_t data)
{
nxt_socket_conf_joint_t *joint;
diff --git a/src/nxt_http.h b/src/nxt_http.h
index c6756ec5..e9cf99f3 100644
--- a/src/nxt_http.h
+++ b/src/nxt_http.h
@@ -183,6 +183,8 @@ nxt_int_t nxt_http_request_content_length(void *ctx, nxt_http_field_t *field,
uintptr_t data);
+extern nxt_time_string_t nxt_http_date_cache;
+
extern nxt_lvlhsh_t nxt_response_fields_hash;
extern const nxt_http_proto_body_read_t nxt_http_proto_body_read[];
diff --git a/src/nxt_http_request.c b/src/nxt_http_request.c
index 2d6ccb42..06d45247 100644
--- a/src/nxt_http_request.c
+++ b/src/nxt_http_request.c
@@ -22,6 +22,16 @@ static const nxt_http_request_state_t nxt_http_request_init_state;
static const nxt_http_request_state_t nxt_http_request_body_state;
+nxt_time_string_t nxt_http_date_cache = {
+ (nxt_atomic_uint_t) -1,
+ nxt_http_date,
+ "%s, %02d %s %4d %02d:%02d:%02d GMT",
+ nxt_length("Wed, 31 Dec 1986 16:40:00 GMT"),
+ NXT_THREAD_TIME_GMT,
+ NXT_THREAD_TIME_SEC,
+};
+
+
nxt_int_t
nxt_http_init(nxt_task_t *task, nxt_runtime_t *rt)
{
@@ -278,15 +288,6 @@ nxt_http_request_header_send(nxt_task_t *task, nxt_http_request_t *r)
u_char *p, *end;
nxt_http_field_t *server, *date, *content_length;
- static nxt_time_string_t date_cache = {
- (nxt_atomic_uint_t) -1,
- nxt_http_date,
- "%s, %02d %s %4d %02d:%02d:%02d GMT",
- nxt_length("Wed, 31 Dec 1986 16:40:00 GMT"),
- NXT_THREAD_TIME_GMT,
- NXT_THREAD_TIME_SEC,
- };
-
/*
* TODO: "Server", "Date", and "Content-Length" processing should be moved
* to the last header filter.
@@ -307,15 +308,15 @@ nxt_http_request_header_send(nxt_task_t *task, nxt_http_request_t *r)
nxt_http_field_name_set(date, "Date");
- p = nxt_mp_nget(r->mem_pool, date_cache.size);
+ p = nxt_mp_nget(r->mem_pool, nxt_http_date_cache.size);
if (nxt_slow_path(p == NULL)) {
goto fail;
}
- (void) nxt_thread_time_string(task->thread, &date_cache, p);
+ (void) nxt_thread_time_string(task->thread, &nxt_http_date_cache, p);
date->value = p;
- date->value_length = date_cache.size;
+ date->value_length = nxt_http_date_cache.size;
r->resp.date = date;
}
generated by cgit (git 2.34.1) at 2024-12-29 08:25:58 +0000