REORG: include: move http_htx.h to haproxy/http_htx{,-t}.h
A few includes had to be added, namely list-t.h in the type file and
types/proxy.h in the proto file. actions.h was including http-htx.h
but didn't need it so it was dropped.
diff --git a/include/types/action.h b/include/types/action.h
index a102b2b..c70fcf7 100644
--- a/include/types/action.h
+++ b/include/types/action.h
@@ -26,7 +26,6 @@
#include <types/applet.h>
#include <types/stick_table.h>
-#include <types/http_htx.h>
enum act_from {
ACT_F_TCP_REQ_CON, /* tcp-request connection */
diff --git a/include/types/http_ana.h b/include/types/http_ana.h
index 4a1a9cd..4dd8e33 100644
--- a/include/types/http_ana.h
+++ b/include/types/http_ana.h
@@ -26,7 +26,7 @@
#include <haproxy/http-t.h>
#include <types/channel.h>
-#include <types/http_htx.h>
+#include <haproxy/http_htx-t.h>
/* These are the flags that are found in txn->flags */
diff --git a/include/types/http_htx.h b/include/types/http_htx.h
deleted file mode 100644
index b3af77e..0000000
--- a/include/types/http_htx.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * include/types/http_htx.h
- * This file defines everything related to HTTP manipulation using the internal
- * representation.
- *
- * Copyright (C) 2018 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, version 2.1
- * exclusively.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _TYPES_HTTP_HTX_H
-#define _TYPES_HTTP_HTX_H
-
-#include <import/ebistree.h>
-
-#include <haproxy/buf-t.h>
-#include <haproxy/http-t.h>
-#include <haproxy/htx-t.h>
-#include <import/ist.h>
-
-/* Context used to find/remove an HTTP header. */
-struct http_hdr_ctx {
- struct htx_blk *blk;
- struct ist value;
- uint16_t lws_before;
- uint16_t lws_after;
-};
-
-
-/* Structure used to build the header list of an HTTP reply */
-struct http_reply_hdr {
- struct ist name; /* the header name */
- struct list value; /* the log-format string value */
- struct list list; /* header chained list */
-};
-
-#define HTTP_REPLY_EMPTY 0x00 /* the reply has no payload */
-#define HTTP_REPLY_ERRMSG 0x01 /* the reply is an error message (may be NULL) */
-#define HTTP_REPLY_ERRFILES 0x02 /* the reply references an http-errors section */
-#define HTTP_REPLY_RAW 0x03 /* the reply use a raw payload */
-#define HTTP_REPLY_LOGFMT 0x04 /* the reply use a log-format payload */
-#define HTTP_REPLY_INDIRECT 0x05 /* the reply references another http-reply (may be NULL) */
-
-/* Uses by HAProxy to generate internal responses */
-struct http_reply {
- unsigned char type; /* HTTP_REPLY_* */
- int status; /* The response status code */
- char *ctype; /* The response content-type, may be NULL */
- struct list hdrs; /* A list of http_reply_hdr */
- union {
- struct list fmt; /* A log-format string (type = HTTP_REPLY_LOGFMT) */
- struct buffer obj; /* A raw string (type = HTTP_REPLY_RAW) */
- struct buffer *errmsg; /* The error message to use as response (type = HTTP_REPLY_ERRMSG).
- * may be NULL, if so rely on the proxy error messages */
- struct http_reply *reply; /* The HTTP reply to use as response (type = HTTP_REPLY_INDIRECT) */
- char *http_errors; /* The http-errors section to use (type = HTTP_REPLY_ERRFILES).
- * Should be resolved during post-check */
- } body;
- struct list list; /* next http_reply in the global list.
- * Only used for replies defined in a proxy section */
-};
-
-/* A custom HTTP error message load from a row file and converted in HTX. The
- * node key is the file path.
- */
-struct http_error_msg {
- struct buffer msg;
- struct ebpt_node node;
-};
-
-/* http-errors section and parameters. */
-struct http_errors {
- char *id; /* unique identifier */
- struct {
- char *file; /* file where the section appears */
- int line; /* line where the section appears */
- } conf; /* config information */
-
- struct http_reply *replies[HTTP_ERR_SIZE]; /* HTTP replies for known errors */
- struct list list; /* http-errors list */
-};
-
-#endif /* _TYPES_HTTP_HTX_H */