summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2020-12-07 18:50:56 +0300
committerValentin Bartenev <vbart@nginx.com>2020-12-07 18:50:56 +0300
commitbda76b04e9aec295c7fa11c7eacb6e11c4bf67f4 (patch)
tree2294d28752e4bf8b0ec1b842e9bf1400d851edc2
parentdb42527b1b2656141af0d8280e59e23be6af67d6 (diff)
downloadunit-bda76b04e9aec295c7fa11c7eacb6e11c4bf67f4.tar.gz
unit-bda76b04e9aec295c7fa11c7eacb6e11c4bf67f4.tar.bz2
HTTP: fixed status line format for unknown status codes.
According to Section #3.1.2 of RFC 7230, after the status code there must be a space even if the reason phrase is empty. Also, only 3 digits allowed. This closes #507 issue on GitHub.
Diffstat (limited to '')
-rw-r--r--docs/changes.xml6
-rw-r--r--src/nxt_h1proto.c37
2 files changed, 26 insertions, 17 deletions
diff --git a/docs/changes.xml b/docs/changes.xml
index 39c270ad..7b90f4a3 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -9,6 +9,12 @@
date="" time="18:00:00 +0300"
packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change type="bugfix">
+<para>
+invalid HTTP responses were generated for some unusual status codes.
+</para>
+</change>
+
</changes>
diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c
index dccbe56c..6aef264c 100644
--- a/src/nxt_h1proto.c
+++ b/src/nxt_h1proto.c
@@ -1151,19 +1151,19 @@ static const nxt_str_t nxt_http_client_error[] = {
nxt_string("HTTP/1.1 415 Unsupported Media Type\r\n"),
nxt_string("HTTP/1.1 416 Range Not Satisfiable\r\n"),
nxt_string("HTTP/1.1 417 Expectation Failed\r\n"),
- nxt_string("HTTP/1.1 418\r\n"),
- nxt_string("HTTP/1.1 419\r\n"),
- nxt_string("HTTP/1.1 420\r\n"),
- nxt_string("HTTP/1.1 421\r\n"),
- nxt_string("HTTP/1.1 422\r\n"),
- nxt_string("HTTP/1.1 423\r\n"),
- nxt_string("HTTP/1.1 424\r\n"),
- nxt_string("HTTP/1.1 425\r\n"),
+ nxt_string("HTTP/1.1 418 I'm a teapot\r\n"),
+ nxt_string("HTTP/1.1 419 \r\n"),
+ nxt_string("HTTP/1.1 420 \r\n"),
+ nxt_string("HTTP/1.1 421 Misdirected Request\r\n"),
+ nxt_string("HTTP/1.1 422 Unprocessable Entity\r\n"),
+ nxt_string("HTTP/1.1 423 Locked\r\n"),
+ nxt_string("HTTP/1.1 424 Failed Dependency\r\n"),
+ nxt_string("HTTP/1.1 425 \r\n"),
nxt_string("HTTP/1.1 426 Upgrade Required\r\n"),
- nxt_string("HTTP/1.1 427\r\n"),
- nxt_string("HTTP/1.1 428\r\n"),
- nxt_string("HTTP/1.1 429\r\n"),
- nxt_string("HTTP/1.1 430\r\n"),
+ nxt_string("HTTP/1.1 427 \r\n"),
+ nxt_string("HTTP/1.1 428 \r\n"),
+ nxt_string("HTTP/1.1 429 \r\n"),
+ nxt_string("HTTP/1.1 430 \r\n"),
nxt_string("HTTP/1.1 431 Request Header Fields Too Large\r\n"),
};
@@ -1190,7 +1190,7 @@ static const nxt_str_t nxt_http_server_error[] = {
};
-#define UNKNOWN_STATUS_LENGTH nxt_length("HTTP/1.1 65536\r\n")
+#define UNKNOWN_STATUS_LENGTH nxt_length("HTTP/1.1 999 \r\n")
static void
nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r,
@@ -1248,13 +1248,16 @@ nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r,
{
status = &nxt_http_server_error[n - NXT_HTTP_INTERNAL_SERVER_ERROR];
- } else {
- p = nxt_sprintf(buf, buf + UNKNOWN_STATUS_LENGTH,
- "HTTP/1.1 %03d\r\n", n);
+ } else if (n <= NXT_HTTP_STATUS_MAX) {
+ (void) nxt_sprintf(buf, buf + UNKNOWN_STATUS_LENGTH,
+ "HTTP/1.1 %03d \r\n", n);
- unknown_status.length = p - buf;
+ unknown_status.length = UNKNOWN_STATUS_LENGTH;
unknown_status.start = buf;
status = &unknown_status;
+
+ } else {
+ status = &nxt_http_server_error[0];
}
size = status->length;