RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-01 00:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: http: Add 410 to http-request deny

Browse Source 
This patch adds http status code 410 Gone to http-request deny. See
issue #80.
This commit is contained in:
Florian Tham 2020-01-08 10:19:05 +01:00 committed by Christopher Faulet
parent 08fa16e397
commit 272e29b5cc
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/configuration.txt
View File

@ -374,6 +374,8 @@ HAProxy may emit the following status codes by itself :
accessing the stats page) accessing the stats page)
403 when a request is forbidden by a "http-request deny" rule 403 when a request is forbidden by a "http-request deny" rule
408 when the request timeout strikes before the request is complete 408 when the request timeout strikes before the request is complete
410 when the requested resource is no longer available and will not
be available again
500 when haproxy encounters an unrecoverable internal error, such as a 500 when haproxy encounters an unrecoverable internal error, such as a
memory allocation failure, which should never happen memory allocation failure, which should never happen
502 when the server returns an empty, invalid or incomplete response, or 502 when the server returns an empty, invalid or incomplete response, or
@ -3605,7 +3607,7 @@ errorfile <code> <file>
yes | yes | yes | yes yes | yes | yes | yes
Arguments : Arguments :
<code> is the HTTP status code. Currently, HAProxy is capable of <code> is the HTTP status code. Currently, HAProxy is capable of
generating codes 200, 400, 403, 405, 408, 425, 429, 500, 502, generating codes 200, 400, 403, 405, 408, 410, 425, 429, 500, 502,
503, and 504. 503, and 504.
<file> designates a file containing the full HTTP response. It is <file> designates a file containing the full HTTP response. It is
@ -3654,7 +3656,7 @@ errorloc302 <code> <url>
yes | yes | yes | yes yes | yes | yes | yes
Arguments : Arguments :
<code> is the HTTP status code. Currently, HAProxy is capable of <code> is the HTTP status code. Currently, HAProxy is capable of
generating codes 200, 400, 403, 405, 408, 425, 429, 500, 502, generating codes 200, 400, 403, 405, 408, 410, 425, 429, 500, 502,
503, and 504. 503, and 504.
<url> it is the exact contents of the "Location" header. It may contain <url> it is the exact contents of the "Location" header. It may contain
@ -3686,7 +3688,7 @@ errorloc303 <code> <url>
yes | yes | yes | yes yes | yes | yes | yes
Arguments : Arguments :
<code> is the HTTP status code. Currently, HAProxy is capable of <code> is the HTTP status code. Currently, HAProxy is capable of
generating codes 200, 400, 403, 405, 408, 425, 429, 500, 502, generating codes 200, 400, 403, 405, 408, 410, 425, 429, 500, 502,
503, and 504. 503, and 504.
<url> it is the exact contents of the "Location" header. It may contain <url> it is the exact contents of the "Location" header. It may contain

1
include/common/http.h
View File

@ -85,6 +85,7 @@ enum {
HTTP_ERR_403, HTTP_ERR_403,
HTTP_ERR_405, HTTP_ERR_405,
HTTP_ERR_408, HTTP_ERR_408,
HTTP_ERR_410,
HTTP_ERR_421, HTTP_ERR_421,
HTTP_ERR_425, HTTP_ERR_425,
HTTP_ERR_429, HTTP_ERR_429,

11
src/http.c
View File

@ -218,6 +218,7 @@ const int http_err_codes[HTTP_ERR_SIZE] = {
[HTTP_ERR_403] = 403, [HTTP_ERR_403] = 403,
[HTTP_ERR_405] = 405, [HTTP_ERR_405] = 405,
[HTTP_ERR_408] = 408, [HTTP_ERR_408] = 408,
[HTTP_ERR_410] = 410,
[HTTP_ERR_421] = 421, [HTTP_ERR_421] = 421,
[HTTP_ERR_425] = 425, [HTTP_ERR_425] = 425,
[HTTP_ERR_429] = 429, [HTTP_ERR_429] = 429,
@ -273,6 +274,15 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
"\r\n" "\r\n"
"<html><body><h1>408 Request Time-out</h1>\nYour browser didn't send a complete request in time.\n</body></html>\n", "<html><body><h1>408 Request Time-out</h1>\nYour browser didn't send a complete request in time.\n</body></html>\n",
[HTTP_ERR_410] =
"HTTP/1.1 410 Gone\r\n"
"Content-length: 114\r\n"
"Cache-Control: no-cache\r\n"
"Connection: close\r\n"
"Content-Type: text/html\r\n"
"\r\n"
"<html><body><h1>410 Gone</h1>\nThe resource is no longer available and will not be available again.\n</body></html>\n",
[HTTP_ERR_421] = [HTTP_ERR_421] =
"HTTP/1.1 421 Misdirected Request\r\n" "HTTP/1.1 421 Misdirected Request\r\n"
"Content-length: 104\r\n" "Content-length: 104\r\n"
@ -379,6 +389,7 @@ int http_get_status_idx(unsigned int status)
case 403: return HTTP_ERR_403; case 403: return HTTP_ERR_403;
case 405: return HTTP_ERR_405; case 405: return HTTP_ERR_405;
case 408: return HTTP_ERR_408; case 408: return HTTP_ERR_408;
case 410: return HTTP_ERR_410;
case 421: return HTTP_ERR_421; case 421: return HTTP_ERR_421;
case 425: return HTTP_ERR_425; case 425: return HTTP_ERR_425;
case 429: return HTTP_ERR_429; case 429: return HTTP_ERR_429;