From: William Lallemand <wlallemand@haproxy.org>
Date: Fri, 24 Sep 2021 17:13:04 +0000 (+0200)
Subject: Revert "head-truc"
X-Git-Tag: v2.5-dev9~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a4e663771f8d3644b05ad8eab30fe6362d1a45c;p=thirdparty%2Fhaproxy.git

Revert "head-truc"

This reverts commit fe67e091859b07dca4622981a8d98a0b64de3cab.

Revert a development/test patch which was accidentely introduced.
---

diff --git a/src/hlua.c b/src/hlua.c
index 4e86a18459..e997964895 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -7007,7 +7007,7 @@ __LJMP static int hlua_httpclient_get_headers(lua_State *L, struct hlua_httpclie
  * in the lua buffer, once the httpclient finished its job, push the result on
  * the stack
  */
-__LJMP static int hlua_httpclient_send_yield(lua_State *L, int status, lua_KContext ctx)
+__LJMP static int hlua_httpclient_get_yield(lua_State *L, int status, lua_KContext ctx)
 {
 	struct buffer *tr;
 	int res;
@@ -7045,15 +7045,17 @@ __LJMP static int hlua_httpclient_send_yield(lua_State *L, int status, lua_KCont
 		task_wakeup(hlua->task, TASK_WOKEN_MSG);
 
 
-	MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_httpclient_send_yield, TICK_ETERNITY, 0));
+	MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_httpclient_get_yield, TICK_ETERNITY, 0));
 	return 0;
 }
 
 /*
- * Send an HTTP request and wait for a response
+ * Sends and receive an HTTP request
+ *
+ * httpclient.get(url, headers)
  */
 
-__LJMP static int hlua_httpclient_send(lua_State *L, enum http_meth_t meth)
+__LJMP static int hlua_httpclient_get(lua_State *L)
 {
 	struct hlua_httpclient *hlua_hc;
 	struct hlua *hlua;
@@ -7099,58 +7101,6 @@ __LJMP static int hlua_httpclient_send(lua_State *L, enum http_meth_t meth)
 	return 0;
 }
 
-/*
- * Sends an HTTP HEAD request and wait for a response
- *
- * httpclient:head(url, headers, payload)
- */
-__LJMP static int hlua_httpclient_head(lua_State *L)
-{
-	return hlua_httpclient_send(L, HTTP_METH_HEAD);
-}
-
-/*
- * Send an HTTP GET request and wait for a response
- *
- * httpclient:get(url, headers, payload)
- */
-__LJMP static int hlua_httpclient_get(lua_State *L)
-{
-	return hlua_httpclient_send(L, HTTP_METH_GET);
-
-}
-
-/*
- * Sends an HTTP PUT request and wait for a response
- *
- * httpclient:put(url, headers, payload)
- */
-__LJMP static int hlua_httpclient_put(lua_State *L)
-{
-	return hlua_httpclient_send(L, HTTP_METH_PUT);
-}
-
-/*
- * Send an HTTP POST request and wait for a response
- *
- * httpclient:post(url, headers, payload)
- */
-__LJMP static int hlua_httpclient_post(lua_State *L)
-{
-	return hlua_httpclient_send(L, HTTP_METH_POST);
-}
-
-
-/*
- * Sends an HTTP HEAD request and wait for a response
- *
- * httpclient:delete(url, headers, payload)
- */
-__LJMP static int hlua_httpclient_delete(lua_State *L)
-{
-	return hlua_httpclient_send(L, HTTP_METH_DELETE);
-}
-
 /*
  *
  *
@@ -11797,10 +11747,6 @@ lua_State *hlua_init_state(int thread_num)
 	lua_pushstring(L, "__index");
 	lua_newtable(L);
 	hlua_class_function(L, "get",         hlua_httpclient_get);
-	hlua_class_function(L, "head",        hlua_httpclient_head);
-	hlua_class_function(L, "put",         hlua_httpclient_put);
-	hlua_class_function(L, "post",        hlua_httpclient_post);
-	hlua_class_function(L, "delete",      hlua_httpclient_delete);
 	lua_settable(L, -3); /* Sets the __index entry. */