From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 28 Apr 2020 17:57:29 +0000 (+0200)
Subject: MINOR: http-htx: Export functions to update message authority and host
X-Git-Tag: v2.2-dev7~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1543d446078291e4084dfd42c9c90c8780ea0b81;p=thirdparty%2Fhaproxy.git

MINOR: http-htx: Export functions to update message authority and host

These functions will be used by HTTP health checks when a request is formatted
before sending it.
---

diff --git a/include/proto/http_htx.h b/include/proto/http_htx.h
index 617417ad5c..99d56b42be 100644
--- a/include/proto/http_htx.h
+++ b/include/proto/http_htx.h
@@ -45,6 +45,9 @@ int http_replace_res_reason(struct htx *htx, const struct ist reason);
 int http_replace_header_value(struct htx *htx, struct http_hdr_ctx *ctx, const struct ist data);
 int http_replace_header(struct htx *htx, struct http_hdr_ctx *ctx, const struct ist name, const struct ist value);
 int http_remove_header(struct htx *htx, struct http_hdr_ctx *ctx);
+int http_update_authority(struct htx *htx, struct htx_sl *sl, const struct ist host);
+int http_update_host(struct htx *htx, struct htx_sl *sl, const struct ist uri);
+
 unsigned int http_get_htx_hdr(const struct htx *htx, const struct ist hdr,
 			      int occ, struct http_hdr_ctx *ctx, char **vptr, size_t *vlen);
 unsigned int http_get_htx_fhdr(const struct htx *htx, const struct ist hdr,
diff --git a/src/http_htx.c b/src/http_htx.c
index 13b11a38aa..e8420a993b 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -53,9 +53,6 @@ struct conf_errors {
 	struct list list;                           /* next conf_errors */
 };
 
-static int http_update_authority(struct htx *htx, struct htx_sl *sl, const struct ist host);
-static int http_update_host(struct htx *htx, struct htx_sl *sl, const struct ist uri);
-
 /* Returns the next unporocessed start line in the HTX message. It returns NULL
  * if the start-line is undefined (first == -1). Otherwise, it returns the
  * pointer on the htx_sl structure.
@@ -577,7 +574,7 @@ int http_remove_header(struct htx *htx, struct http_hdr_ctx *ctx)
  * contains an authority. Thus, if no authority is found in the uri, an error is
  * returned.
  */
-static int http_update_authority(struct htx *htx, struct htx_sl *sl, const struct ist host)
+int http_update_authority(struct htx *htx, struct htx_sl *sl, const struct ist host)
 {
 	struct buffer *temp = get_trash_chunk();
 	struct ist meth, vsn, uri, authority;
@@ -614,7 +611,7 @@ static int http_update_authority(struct htx *htx, struct htx_sl *sl, const struc
  * authority is used to set the value of the header host. This function returns
  * 0 on failure and 1 on success.
 */
-static int http_update_host(struct htx *htx, struct htx_sl *sl, const struct ist uri)
+int http_update_host(struct htx *htx, struct htx_sl *sl, const struct ist uri)
 {
 	struct ist authority;
 	struct http_hdr_ctx ctx;