This is an automated email from the ASF dual-hosted git repository.
kichan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 1867a04e35 Remove support of matrix parameters in Lua plugin (#11580)
1867a04e35 is described below
commit 1867a04e35590b6071d07f7ff56541ae44347592
Author: Kit Chan <[email protected]>
AuthorDate: Mon Jul 22 08:56:28 2024 -0700
Remove support of matrix parameters in Lua plugin (#11580)
* Update ts_lua_client_request.cc
* Update ts_lua_server_request.cc
* Update lua.en.rst
---
doc/admin-guide/plugins/lua.en.rst | 83 ------------------------------------
plugins/lua/ts_lua_client_request.cc | 51 ----------------------
plugins/lua/ts_lua_server_request.cc | 56 ------------------------
3 files changed, 190 deletions(-)
diff --git a/doc/admin-guide/plugins/lua.en.rst
b/doc/admin-guide/plugins/lua.en.rst
index bb21160854..cbef95f3c4 100644
--- a/doc/admin-guide/plugins/lua.en.rst
+++ b/doc/admin-guide/plugins/lua.en.rst
@@ -878,45 +878,6 @@ ts.client_request.set_uri_args
ts.client_request.set_uri_args('n=6&p=7')
-:ref:`TOP <admin-plugins-ts-lua>`
-
-ts.client_request.get_uri_params
---------------------------------
-**syntax:** *ts.client_request.get_uri_params()*
-
-**context:** do_remap/do_os_response or do_global_* or later
-
-**description:** This function can be used to retrieve the client request's
parameter string.
-
-Here is an example:
-
-::
-
- function do_remap()
- local query = ts.client_request.get_uri_params()
- ts.debug(query)
- end
-
-Then ``GET /st;a=1`` will yield the output:
-
-``a=1``
-
-
-:ref:`TOP <admin-plugins-ts-lua>`
-
-ts.client_request.set_uri_params
---------------------------------
-**syntax:** *ts.client_request.set_uri_params(PARAMETER_STRING)*
-
-**context:** do_remap or do_global_*
-
-**description:** This function can be used to override the client request's
parameter string.
-
-::
-
- ts.client_request.set_uri_params('n=6')
-
-
:ref:`TOP <admin-plugins-ts-lua>`
ts.client_request.get_url
@@ -1749,50 +1710,6 @@ ts.server_request.set_uri_args
ts.server_request.set_uri_args('n=6&p=7')
-:ref:`TOP <admin-plugins-ts-lua>`
-
-ts.server_request.get_uri_params
---------------------------------
-**syntax:** *ts.server_request.get_uri_params()*
-
-**context:** function @ TS_LUA_HOOK_SEND_REQUEST_HDR hook point or later
-
-**description:** This function can be used to retrieve the server request's
parameter string.
-
-Here is an example:
-
-::
-
- function send_request()
- local query = ts.server_request.get_uri_params()
- ts.debug(query)
- end
-
- function do_remap()
- ts.hook(TS_LUA_HOOK_SEND_REQUEST_HDR, send_request)
- return 0
- end
-
-Then ``GET /st;a=1`` will yield the output:
-
-``a=1``
-
-
-:ref:`TOP <admin-plugins-ts-lua>`
-
-ts.server_request.set_uri_params
---------------------------------
-**syntax:** *ts.server_request.set_uri_params(PARAMETER_STRING)*
-
-**context:** function @ TS_LUA_HOOK_SEND_REQUEST_HDR hook point
-
-**description:** This function can be used to override the server request's
parameter string.
-
-::
-
- ts.server_request.set_uri_params('n=6')
-
-
:ref:`TOP <admin-plugins-ts-lua>`
ts.server_request.header.HEADER
diff --git a/plugins/lua/ts_lua_client_request.cc
b/plugins/lua/ts_lua_client_request.cc
index 11d66fd375..ef98ad8af7 100644
--- a/plugins/lua/ts_lua_client_request.cc
+++ b/plugins/lua/ts_lua_client_request.cc
@@ -41,8 +41,6 @@ static int ts_lua_client_request_get_uri(lua_State *L);
static int ts_lua_client_request_set_uri(lua_State *L);
static int ts_lua_client_request_set_uri_args(lua_State *L);
static int ts_lua_client_request_get_uri_args(lua_State *L);
-static int ts_lua_client_request_set_uri_params(lua_State *L);
-static int ts_lua_client_request_get_uri_params(lua_State *L);
static int ts_lua_client_request_get_method(lua_State *L);
static int ts_lua_client_request_set_method(lua_State *L);
static int ts_lua_client_request_get_version(lua_State *L);
@@ -58,7 +56,6 @@ static void
ts_lua_inject_client_request_headers_api(lua_State *L);
static void ts_lua_inject_client_request_url_api(lua_State *L);
static void ts_lua_inject_client_request_uri_api(lua_State *L);
static void ts_lua_inject_client_request_args_api(lua_State *L);
-static void ts_lua_inject_client_request_params_api(lua_State *L);
static void ts_lua_inject_client_request_method_api(lua_State *L);
static void ts_lua_inject_client_request_version_api(lua_State *L);
static void ts_lua_inject_client_request_body_size_api(lua_State *L);
@@ -90,7 +87,6 @@ ts_lua_inject_client_request_api(lua_State *L)
ts_lua_inject_client_request_url_api(L);
ts_lua_inject_client_request_uri_api(L);
ts_lua_inject_client_request_args_api(L);
- ts_lua_inject_client_request_params_api(L);
ts_lua_inject_client_request_method_api(L);
ts_lua_inject_client_request_version_api(L);
ts_lua_inject_client_request_body_size_api(L);
@@ -699,53 +695,6 @@ ts_lua_client_request_set_uri_args(lua_State *L)
return 0;
}
-static void
-ts_lua_inject_client_request_params_api(lua_State *L)
-{
- lua_pushcfunction(L, ts_lua_client_request_set_uri_params);
- lua_setfield(L, -2, "set_uri_params");
-
- lua_pushcfunction(L, ts_lua_client_request_get_uri_params);
- lua_setfield(L, -2, "get_uri_params");
-}
-
-static int
-ts_lua_client_request_get_uri_params(lua_State *L)
-{
- const char *param;
- int param_len;
-
- ts_lua_http_ctx *http_ctx;
-
- GET_HTTP_CONTEXT(http_ctx, L);
-
- param = TSUrlHttpParamsGet(http_ctx->client_request_bufp,
http_ctx->client_request_url, ¶m_len);
-
- if (param && param_len > 0) {
- lua_pushlstring(L, param, param_len);
- } else {
- lua_pushnil(L);
- }
-
- return 1;
-}
-
-static int
-ts_lua_client_request_set_uri_params(lua_State *L)
-{
- const char *param;
- size_t param_len;
-
- ts_lua_http_ctx *http_ctx;
-
- GET_HTTP_CONTEXT(http_ctx, L);
-
- param = luaL_checklstring(L, 1, ¶m_len);
- TSUrlHttpParamsSet(http_ctx->client_request_bufp,
http_ctx->client_request_url, param, param_len);
-
- return 0;
-}
-
static int
ts_lua_client_request_client_addr_get_ip(lua_State *L)
{
diff --git a/plugins/lua/ts_lua_server_request.cc
b/plugins/lua/ts_lua_server_request.cc
index 11dcebb538..f787487ad4 100644
--- a/plugins/lua/ts_lua_server_request.cc
+++ b/plugins/lua/ts_lua_server_request.cc
@@ -50,7 +50,6 @@ static void
ts_lua_inject_server_request_get_header_size_api(lua_State *L);
static void ts_lua_inject_server_request_get_body_size_api(lua_State *L);
static void ts_lua_inject_server_request_uri_api(lua_State *L);
static void ts_lua_inject_server_request_uri_args_api(lua_State *L);
-static void ts_lua_inject_server_request_uri_params_api(lua_State *L);
static void ts_lua_inject_server_request_url_api(lua_State *L);
static void ts_lua_inject_server_request_method_api(lua_State *L);
@@ -65,8 +64,6 @@ static int ts_lua_server_request_get_uri(lua_State *L);
static int ts_lua_server_request_set_uri(lua_State *L);
static int ts_lua_server_request_set_uri_args(lua_State *L);
static int ts_lua_server_request_get_uri_args(lua_State *L);
-static int ts_lua_server_request_set_uri_params(lua_State *L);
-static int ts_lua_server_request_get_uri_params(lua_State *L);
static int ts_lua_server_request_get_method(lua_State *L);
static int ts_lua_server_request_set_method(lua_State *L);
static int ts_lua_server_request_get_url_host(lua_State *L);
@@ -100,7 +97,6 @@ ts_lua_inject_server_request_api(lua_State *L)
ts_lua_inject_server_request_method_api(L);
ts_lua_inject_server_request_uri_api(L);
ts_lua_inject_server_request_uri_args_api(L);
- ts_lua_inject_server_request_uri_params_api(L);
ts_lua_inject_server_request_url_api(L);
@@ -588,58 +584,6 @@ ts_lua_server_request_get_uri_args(lua_State *L)
return 1;
}
-static void
-ts_lua_inject_server_request_uri_params_api(lua_State *L)
-{
- lua_pushcfunction(L, ts_lua_server_request_set_uri_params);
- lua_setfield(L, -2, "set_uri_params");
-
- lua_pushcfunction(L, ts_lua_server_request_get_uri_params);
- lua_setfield(L, -2, "get_uri_params");
-}
-
-static int
-ts_lua_server_request_set_uri_params(lua_State *L)
-{
- const char *param;
- size_t param_len;
-
- ts_lua_http_ctx *http_ctx;
-
- GET_HTTP_CONTEXT(http_ctx, L);
-
- TS_LUA_CHECK_SERVER_REQUEST_URL(http_ctx);
-
- param = luaL_checklstring(L, 1, ¶m_len);
- TSUrlHttpParamsSet(http_ctx->server_request_bufp,
http_ctx->server_request_url, param, param_len);
-
- return 0;
-}
-
-static int
-ts_lua_server_request_get_uri_params(lua_State *L)
-{
- const char *param;
- int param_len;
-
- ts_lua_http_ctx *http_ctx;
-
- GET_HTTP_CONTEXT(http_ctx, L);
-
- TS_LUA_CHECK_SERVER_REQUEST_URL(http_ctx);
-
- param = TSUrlHttpParamsGet(http_ctx->server_request_bufp,
http_ctx->server_request_url, ¶m_len);
-
- if (param && param_len > 0) {
- lua_pushlstring(L, param, param_len);
-
- } else {
- lua_pushnil(L);
- }
-
- return 1;
-}
-
static void
ts_lua_inject_server_request_url_api(lua_State *L)
{
