RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 21:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: http-ana: Add an error message in the txn and send it when defined

Browse Source 
It is now possible to set the error message to return to client in the HTTP
transaction. If it is defined, this error message is used instead of proxy's
errors or default errors.
This commit is contained in:
Christopher Faulet 2020-01-14 11:12:37 +01:00
parent e0fca297d5
commit 473e880a25
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/http_ana.h
View File

@ -175,6 +175,7 @@ struct http_txn {
enum http_meth_t meth; /* HTTP method */
/* 1 unused byte here */
short status; /* HTTP status from the server, negative if from proxy */
struct buffer *errmsg; /* custom HTTP error message to use as reply */
char cache_hash[20]; /* Store the cache hash */
char *uri; /* first line if log needed, NULL otherwise */

5
src/http_ana.c
View File

@ -4597,7 +4597,9 @@ struct buffer *http_error_message(struct stream *s)
{
const int msgnum = http_get_status_idx(s->txn->status);
if (s->be->errmsg[msgnum])
if (s->txn && s->txn->errmsg)
return s->txn->errmsg;
else if (s->be->errmsg[msgnum])
return s->be->errmsg[msgnum];
else if (strm_fe(s)->errmsg[msgnum])
return strm_fe(s)->errmsg[msgnum];
@ -5024,6 +5026,7 @@ void http_init_txn(struct stream *s)
? (TX_NOT_FIRST|TX_WAIT_NEXT_RQ)
: 0);
txn->status = -1;
txn->errmsg = NULL;
*(unsigned int *)txn->cache_hash = 0;
txn->cookie_first_date = 0;