diff --git a/doc/configuration.txt b/doc/configuration.txt index bba695afd..5a8c8b54e 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -3154,8 +3154,8 @@ errorfile yes | yes | yes | yes Arguments : is the HTTP status code. Currently, HAProxy is capable of - generating codes 200, 400, 403, 405, 408, 429, 500, 502, 503, and - 504. + generating codes 200, 400, 403, 405, 408, 425, 429, 500, 502, + 503, and 504. designates a file containing the full HTTP response. It is recommended to follow the common practice of appending ".http" to @@ -3203,8 +3203,8 @@ errorloc302 yes | yes | yes | yes Arguments : is the HTTP status code. Currently, HAProxy is capable of - generating codes 200, 400, 403, 405, 408, 429, 500, 502, 503, and - 504. + generating codes 200, 400, 403, 405, 408, 425, 429, 500, 502, + 503, and 504. it is the exact contents of the "Location" header. It may contain either a relative URI to an error page hosted on the same site, @@ -3235,8 +3235,8 @@ errorloc303 yes | yes | yes | yes Arguments : is the HTTP status code. Currently, HAProxy is capable of - generating codes 200, 400, 403, 405, 408, 429, 500, 502, 503, and - 504. + generating codes 200, 400, 403, 405, 408, 425, 429, 500, 502, + 503, and 504. it is the exact contents of the "Location" header. It may contain either a relative URI to an error page hosted on the same site, diff --git a/include/types/proto_http.h b/include/types/proto_http.h index 027bfce42..cf0fdb698 100644 --- a/include/types/proto_http.h +++ b/include/types/proto_http.h @@ -196,6 +196,7 @@ enum { HTTP_ERR_403, HTTP_ERR_405, HTTP_ERR_408, + HTTP_ERR_425, HTTP_ERR_429, HTTP_ERR_500, HTTP_ERR_502, diff --git a/src/proto_http.c b/src/proto_http.c index c81409f39..939a7a137 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -140,6 +140,7 @@ const int http_err_codes[HTTP_ERR_SIZE] = { [HTTP_ERR_403] = 403, [HTTP_ERR_405] = 405, [HTTP_ERR_408] = 408, + [HTTP_ERR_425] = 425, [HTTP_ERR_429] = 429, [HTTP_ERR_500] = 500, [HTTP_ERR_502] = 502, @@ -188,6 +189,14 @@ static const char *http_err_msgs[HTTP_ERR_SIZE] = { "\r\n" "

408 Request Time-out

\nYour browser didn't send a complete request in time.\n\n", + [HTTP_ERR_425] = + "HTTP/1.0 425 Too Early\r\n" + "Cache-Control: no-cache\r\n" + "Connection: close\r\n" + "Content-Type: text/html\r\n" + "\r\n" + "

425 Too Early

\nYour browser sent early data.\n\n", + [HTTP_ERR_429] = "HTTP/1.0 429 Too Many Requests\r\n" "Cache-Control: no-cache\r\n" @@ -332,7 +341,7 @@ const char *get_reason(unsigned int status) case 422: return "Unprocessable entity"; case 423: return "Locked"; case 424: return "Method failure"; - case 425: return "Unordered Collection"; + case 425: return "Too Early"; case 426: return "Upgrade Required"; case 428: return "Precondition Required"; case 429: return "Too Many Requests"; @@ -378,6 +387,7 @@ static const int http_get_status_idx(unsigned int status) case 403: return HTTP_ERR_403; case 405: return HTTP_ERR_405; case 408: return HTTP_ERR_408; + case 425: return HTTP_ERR_425; case 429: return HTTP_ERR_429; case 500: return HTTP_ERR_500; case 502: return HTTP_ERR_502;