]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
projects / thirdparty / haproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5abdc76)
MINOR: http: turn default error files to HTTP/1.1
authorWilly Tarreau <w@1wt.eu>
Tue, 11 Jun 2019 14:08:25 +0000 (16:08 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 11 Jun 2019 14:37:13 +0000 (16:37 +0200)
For quite a long time we've been saying that the default error files
should produce HTTP/1.1 responses and since it's of low importance, it
always gets forgotten.

So here it finally comes. Each status code now properly contains a
content-length header so that the output is clean and doesn't force
upstream proxies to switch to chunked encoding or to close the connection
immediately after the response, which is particularly annoying for 401
or 407 for example. It's worth noting that the 3xx codes had already
been turned to HTTP/1.1.

This patch will obviously not change anything for user-provided error files.

src/http.c patch | blob | blame | history
src/proto_htx.c patch | blob | blame | history

diff --git a/src/http.c b/src/http.c
index 7c3f6bbcfe6835c24dbd4c5021aac5b195b2beaa..66a4282f4d42d993a2229b749f133726c98b18d3 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -198,7 +198,8 @@ const char *HTTP_308 =
 
 /* Warning: this one is an sprintf() fmt string, with <realm> as its only argument */
 const char *HTTP_401_fmt =
-       "HTTP/1.0 401 Unauthorized\r\n"
+       "HTTP/1.1 401 Unauthorized\r\n"
+       "Content-length: 112\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -207,7 +208,8 @@ const char *HTTP_401_fmt =
        "<html><body><h1>401 Unauthorized</h1>\nYou need a valid user and password to access this content.\n</body></html>\n";
 
 const char *HTTP_407_fmt =
-       "HTTP/1.0 407 Unauthorized\r\n"
+       "HTTP/1.1 407 Unauthorized\r\n"
+       "Content-length: 112\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -232,7 +234,8 @@ const int http_err_codes[HTTP_ERR_SIZE] = {
 
 const char *http_err_msgs[HTTP_ERR_SIZE] = {
        [HTTP_ERR_200] =
-       "HTTP/1.0 200 OK\r\n"
+       "HTTP/1.1 200 OK\r\n"
+       "Content-length: 58\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -240,7 +243,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>200 OK</h1>\nService ready.\n</body></html>\n",
 
        [HTTP_ERR_400] =
-       "HTTP/1.0 400 Bad request\r\n"
+       "HTTP/1.1 400 Bad request\r\n"
+       "Content-length: 90\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -248,7 +252,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>400 Bad request</h1>\nYour browser sent an invalid request.\n</body></html>\n",
 
        [HTTP_ERR_403] =
-       "HTTP/1.0 403 Forbidden\r\n"
+       "HTTP/1.1 403 Forbidden\r\n"
+       "Content-length: 93\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -256,7 +261,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>403 Forbidden</h1>\nRequest forbidden by administrative rules.\n</body></html>\n",
 
        [HTTP_ERR_405] =
-       "HTTP/1.0 405 Method Not Allowed\r\n"
+       "HTTP/1.1 405 Method Not Allowed\r\n"
+       "Content-length: 146\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -264,7 +270,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>405 Method Not Allowed</h1>\nA request was made of a resource using a request method not supported by that resource\n</body></html>\n",
 
        [HTTP_ERR_408] =
-       "HTTP/1.0 408 Request Time-out\r\n"
+       "HTTP/1.1 408 Request Time-out\r\n"
+       "Content-length: 110\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -272,7 +279,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>408 Request Time-out</h1>\nYour browser didn't send a complete request in time.\n</body></html>\n",
 
        [HTTP_ERR_421] =
-       "HTTP/1.0 421 Misdirected Request\r\n"
+       "HTTP/1.1 421 Misdirected Request\r\n"
+       "Content-length: 104\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -280,7 +288,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>421 Misdirected Request</h1>\nRequest sent to a non-authoritative server.\n</body></html>\n",
 
        [HTTP_ERR_425] =
-       "HTTP/1.0 425 Too Early\r\n"
+       "HTTP/1.1 425 Too Early\r\n"
+       "Content-length: 80\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -288,7 +297,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>425 Too Early</h1>\nYour browser sent early data.\n</body></html>\n",
 
        [HTTP_ERR_429] =
-       "HTTP/1.0 429 Too Many Requests\r\n"
+       "HTTP/1.1 429 Too Many Requests\r\n"
+       "Content-length: 117\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -296,7 +306,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>429 Too Many Requests</h1>\nYou have sent too many requests in a given amount of time.\n</body></html>\n",
 
        [HTTP_ERR_500] =
-       "HTTP/1.0 500 Internal Server Error\r\n"
+       "HTTP/1.1 500 Internal Server Error\r\n"
+       "Content-length: 96\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -304,7 +315,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>500 Internal Server Error</h1>\nAn internal server error occured.\n</body></html>\n",
 
        [HTTP_ERR_502] =
-       "HTTP/1.0 502 Bad Gateway\r\n"
+       "HTTP/1.1 502 Bad Gateway\r\n"
+       "Content-length: 107\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -312,7 +324,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>502 Bad Gateway</h1>\nThe server returned an invalid or incomplete response.\n</body></html>\n",
 
        [HTTP_ERR_503] =
-       "HTTP/1.0 503 Service Unavailable\r\n"
+       "HTTP/1.1 503 Service Unavailable\r\n"
+       "Content-length: 107\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
@@ -320,7 +333,8 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>503 Service Unavailable</h1>\nNo server is available to handle this request.\n</body></html>\n",
 
        [HTTP_ERR_504] =
-       "HTTP/1.0 504 Gateway Time-out\r\n"
+       "HTTP/1.1 504 Gateway Time-out\r\n"
+       "Content-length: 92\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
diff --git a/src/proto_htx.c b/src/proto_htx.c
index f52714b27affa1ad26681fb506a8dfd564f559b4..7a1f9c5168dc668b679a3d5cdaf7f148e2e2f8b8 100644 (file)
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -5496,7 +5496,8 @@ static int htx_reply_40x_unauthorized(struct stream *s, const char *auth_realm)
        if (chunk_printf(&trash, "Basic realm=\"%s\"", auth_realm) == -1)
                goto fail;
 
-        if (!htx_add_header(htx, ist("Cache-Control"), ist("no-cache")) ||
+        if (!htx_add_header(htx, ist("Content-length"), ist("112")) ||
+           !htx_add_header(htx, ist("Cache-Control"), ist("no-cache")) ||
            !htx_add_header(htx, ist("Connection"), ist("close")) ||
            !htx_add_header(htx, ist("Content-Type"), ist("text/html")))
                goto fail;
Mirror of https://github.com/haproxy/haproxy.git