diff options
| author | Andrei Belov <defan@nginx.com> | 2019-10-03 17:46:28 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-10-03 17:46:28 +0300 |
| commit | 3dd3f861f4c3aa320aa137802f033f8f1fc7dc41 (patch) | |
| tree | 357577c560920eb0f5837b7d073999f5c7a1a2cd /src/nxt_http_error.c | |
| parent | 9de7aea721245cda9f079a2b29d8efaf99c440fd (diff) | |
| parent | 59db9a3887211fccdaec04b7952ad0140090de22 (diff) | |
| download | unit-3dd3f861f4c3aa320aa137802f033f8f1fc7dc41.tar.gz unit-3dd3f861f4c3aa320aa137802f033f8f1fc7dc41.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/nxt_http_error.c')
| -rw-r--r-- | src/nxt_http_error.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/nxt_http_error.c b/src/nxt_http_error.c index 1dcd8783..8e8b80f1 100644 --- a/src/nxt_http_error.c +++ b/src/nxt_http_error.c @@ -16,8 +16,12 @@ static const nxt_http_request_state_t nxt_http_request_send_error_body_state; static const char error[] = - "<html><head><title>Error</title></head>" - "<body>Error.</body></html>\r\n"; + "<!DOCTYPE html>" + "<title>Error %03d</title>" + "<p>Error %03d.\r\n"; + +/* Two %03d (4 chars) patterns are replaced by status code (3 chars). */ +#define NXT_HTTP_ERROR_LEN (nxt_length(error) - 2) void @@ -49,7 +53,7 @@ nxt_http_request_error(nxt_task_t *task, nxt_http_request_t *r, nxt_http_field_set(content_type, "Content-Type", "text/html"); r->resp.content_length = NULL; - r->resp.content_length_n = nxt_length(error); + r->resp.content_length_n = NXT_HTTP_ERROR_LEN; r->state = &nxt_http_request_send_error_body_state; @@ -80,15 +84,13 @@ nxt_http_request_send_error_body(nxt_task_t *task, void *obj, void *data) nxt_debug(task, "http request send error body"); - out = nxt_http_buf_mem(task, r, 0); + out = nxt_http_buf_mem(task, r, NXT_HTTP_ERROR_LEN); if (nxt_slow_path(out == NULL)) { goto fail; } - out->mem.start = (u_char *) error; - out->mem.pos = out->mem.start; - out->mem.free = out->mem.start + nxt_length(error); - out->mem.end = out->mem.free; + out->mem.free = nxt_sprintf(out->mem.pos, out->mem.end, error, + r->status, r->status); out->next = nxt_http_buf_last(r); |