RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-18 13:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: lua: Stop using the lua txn in hlua_http_rep_hdr()

Browse Source 
In this function, the lua txn was only used to retrieve the stream. But it can
be retieve from the HTTP message, using its channel pointer. So, the lua txn can
be removed from the function argument list.

This patch is mandatory to allow the support of the filters written in lua.
This commit is contained in:
Christopher Faulet 2020-02-24 16:52:46 +01:00
parent 9d1332bbf4
commit d1914aaa03
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hlua.c
View File

@ -4749,8 +4749,7 @@ __LJMP static int hlua_http_res_get_headers(lua_State *L)
* the request or in the response. It is a wrapper fir the
* 4 following functions.
*/
__LJMP static inline int hlua_http_rep_hdr(lua_State *L, struct hlua_txn *htxn,
struct http_msg *msg, int full)
__LJMP static inline int hlua_http_rep_hdr(lua_State *L, struct http_msg *msg, int full)
{
size_t name_len;
const char *name = MAY_LJMP(luaL_checklstring(L, 2, &name_len));
@ -4763,7 +4762,7 @@ __LJMP static inline int hlua_http_rep_hdr(lua_State *L, struct hlua_txn *htxn,
WILL_LJMP(luaL_argerror(L, 3, "invalid regex"));
htx = htxbuf(&msg->chn->buf);
http_replace_hdrs(htxn->s, htx, ist2(name, name_len), value, re, full);
http_replace_hdrs(chn_strm(msg->chn), htx, ist2(name, name_len), value, re, full);
regex_free(re);
return 0;
}
@ -4778,7 +4777,7 @@ __LJMP static int hlua_http_req_rep_hdr(lua_State *L)
if (htxn->dir != SMP_OPT_DIR_REQ || !(htxn->flags & HLUA_TXN_HTTP_RDY))
WILL_LJMP(lua_error(L));
return MAY_LJMP(hlua_http_rep_hdr(L, htxn, &htxn->s->txn->req, 1));
return MAY_LJMP(hlua_http_rep_hdr(L, &htxn->s->txn->req, 1));
}
__LJMP static int hlua_http_res_rep_hdr(lua_State *L)
@ -4791,7 +4790,7 @@ __LJMP static int hlua_http_res_rep_hdr(lua_State *L)
if (htxn->dir != SMP_OPT_DIR_RES || !(htxn->flags & HLUA_TXN_HTTP_RDY))
WILL_LJMP(lua_error(L));
return MAY_LJMP(hlua_http_rep_hdr(L, htxn, &htxn->s->txn->rsp, 1));
return MAY_LJMP(hlua_http_rep_hdr(L, &htxn->s->txn->rsp, 1));
}
__LJMP static int hlua_http_req_rep_val(lua_State *L)
@ -4804,7 +4803,7 @@ __LJMP static int hlua_http_req_rep_val(lua_State *L)
if (htxn->dir != SMP_OPT_DIR_REQ || !(htxn->flags & HLUA_TXN_HTTP_RDY))
WILL_LJMP(lua_error(L));
return MAY_LJMP(hlua_http_rep_hdr(L, htxn, &htxn->s->txn->req, 0));
return MAY_LJMP(hlua_http_rep_hdr(L, &htxn->s->txn->req, 0));
}
__LJMP static int hlua_http_res_rep_val(lua_State *L)
@ -4817,7 +4816,7 @@ __LJMP static int hlua_http_res_rep_val(lua_State *L)
if (htxn->dir != SMP_OPT_DIR_RES || !(htxn->flags & HLUA_TXN_HTTP_RDY))
WILL_LJMP(lua_error(L));
return MAY_LJMP(hlua_http_rep_hdr(L, htxn, &htxn->s->txn->rsp, 0));
return MAY_LJMP(hlua_http_rep_hdr(L, &htxn->s->txn->rsp, 0));
}
/* This function deletes all the occurrences of an header.