REORG: http: move HTTP rules parsing to http_rules.c

These ones are mostly called from cfgparse.c for the parsing and do
not depend on the HTTP representation. The functions's prototypes
were moved to proto/http_rules.h, making this file work exactly like
tcp_rules. Ideally we should stop calling these functions directly
from cfgparse and register keywords, but there are a few cases where
that wouldn't work (stats http-request) so it's probably not worth
trying to go this far.

Makefile

@@ -895,7 +895,7 @@ OBJS = src/proto_http.o src/cfgparse.o src/server.o src/stream.o        \
        src/protocol.o src/lru.o src/hdr_idx.o src/hpack-huff.o          \
        src/mailers.o src/h2.o src/base64.o src/hash.o src/http.o	\
        src/http_acl.o src/http_fetch.o src/http_conv.o src/http_act.o   \
-       src/proto_sockpair.o
+       src/http_rules.o src/proto_sockpair.o
 
 EBTREE_OBJS = $(EBTREE_DIR)/ebtree.o $(EBTREE_DIR)/eb32sctree.o \
               $(EBTREE_DIR)/eb32tree.o $(EBTREE_DIR)/eb64tree.o \

include/proto/http_rules.h

@@ -0,0 +1,57 @@
+/*
+ * include/proto/http_rules.h
+ * This file contains "http" rules definitions
+ *
+ * Copyright (C) 2000-2018 Willy Tarreau - w@1wt.eu
+ *
+ * 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 _PROTO_HTTP_RULES_H
+#define _PROTO_HTTP_RULES_H
+
+#include <common/config.h>
+#include <common/mini-clist.h>
+#include <types/action.h>
+#include <types/proxy.h>
+
+extern struct action_kw_list http_req_keywords;
+extern struct action_kw_list http_res_keywords;
+
+struct act_rule *parse_http_req_cond(const char **args, const char *file, int linenum, struct proxy *proxy);
+struct act_rule *parse_http_res_cond(const char **args, const char *file, int linenum, struct proxy *proxy);
+void free_http_req_rules(struct list *r);
+void free_http_res_rules(struct list *r);
+struct redirect_rule *http_parse_redirect_rule(const char *file, int linenum, struct proxy *curproxy,
+                                               const char **args, char **errmsg, int use_fmt, int dir);
+
+static inline void http_req_keywords_register(struct action_kw_list *kw_list)
+{
+	LIST_ADDQ(&http_req_keywords.list, &kw_list->list);
+}
+
+static inline void http_res_keywords_register(struct action_kw_list *kw_list)
+{
+	LIST_ADDQ(&http_res_keywords.list, &kw_list->list);
+}
+
+#endif /* _PROTO_HTTP_RULES_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ * End:
+ */

include/proto/proto_http.h

@@ -23,7 +23,6 @@
 #define _PROTO_PROTO_HTTP_H
 
 #include <common/config.h>
-#include <types/action.h>
 #include <types/proto_http.h>
 #include <types/stream.h>
 #include <types/task.h>
@@ -115,28 +114,8 @@ void http_reset_txn(struct stream *s);
 void http_end_txn_clean_session(struct stream *s);
 void http_adjust_conn_mode(struct stream *s, struct http_txn *txn, struct http_msg *msg);
 
-struct act_rule *parse_http_req_cond(const char **args, const char *file, int linenum, struct proxy *proxy);
-struct act_rule *parse_http_res_cond(const char **args, const char *file, int linenum, struct proxy *proxy);
-void free_http_req_rules(struct list *r);
-void free_http_res_rules(struct list *r);
 void http_reply_and_close(struct stream *s, short status, struct buffer *msg);
 struct buffer *http_error_message(struct stream *s);
-struct redirect_rule *http_parse_redirect_rule(const char *file, int linenum, struct proxy *curproxy,
-                                               const char **args, char **errmsg, int use_fmt, int dir);
-
-struct action_kw *action_http_req_custom(const char *kw);
-struct action_kw *action_http_res_custom(const char *kw);
-
-static inline void http_req_keywords_register(struct action_kw_list *kw_list)
-{
-	LIST_ADDQ(&http_req_keywords.list, &kw_list->list);
-}
-
-static inline void http_res_keywords_register(struct action_kw_list *kw_list)
-{
-	LIST_ADDQ(&http_res_keywords.list, &kw_list->list);
-}
-
 
 /* to be used when contents change in an HTTP message */
 #define http_msg_move_end(msg, bytes) do { \

include/proto/stream.h

@@ -24,6 +24,7 @@
 
 #include <common/config.h>
 #include <common/memory.h>
+#include <types/action.h>
 #include <types/stream.h>
 #include <proto/fd.h>
 #include <proto/freq_ctr.h>

include/types/proto_http.h

@@ -317,9 +317,6 @@ struct hdr_ctx {
 	int  prev; /* index of previous header */
 };
 
-extern struct action_kw_list http_req_keywords;
-extern struct action_kw_list http_res_keywords;
-
 extern struct pool_head *pool_head_http_txn;
 
 #endif /* _TYPES_PROTO_HTTP_H */

src/cache.c

@@ -24,6 +24,7 @@
 #include <proto/proxy.h>
 #include <proto/hdr_idx.h>
 #include <proto/filters.h>
+#include <proto/http_rules.h>
 #include <proto/proto_http.h>
 #include <proto/log.h>
 #include <proto/stream.h>

src/cfgparse.c

@@ -66,6 +66,7 @@
 #include <proto/filters.h>
 #include <proto/frontend.h>
 #include <proto/hdr_idx.h>
+#include <proto/http_rules.h>
 #include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>

src/flt_spoe.c

@@ -31,6 +31,7 @@
 #include <proto/filters.h>
 #include <proto/freq_ctr.h>
 #include <proto/frontend.h>
+#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/proto_http.h>
 #include <proto/proxy.h>

src/haproxy.c

@@ -99,6 +99,7 @@
 #include <proto/filters.h>
 #include <proto/hdr_idx.h>
 #include <proto/hlua.h>
+#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/pattern.h>

src/hlua.c

@@ -43,6 +43,7 @@
 #include <proto/hlua.h>
 #include <proto/hlua_fcn.h>
 #include <proto/http_fetch.h>
+#include <proto/http_rules.h>
 #include <proto/map.h>
 #include <proto/obj_type.h>
 #include <proto/queue.h>

src/http_act.c

@@ -30,6 +30,7 @@
 
 #include <proto/acl.h>
 #include <proto/arg.h>
+#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/proto_http.h>
 

src/proto_tcp.c

@@ -49,6 +49,7 @@
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/fd.h>
+#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/port_range.h>

src/queue.c

@@ -75,6 +75,7 @@
 #include <common/hathreads.h>
 #include <eb32tree.h>
 
+#include <proto/http_rules.h>
 #include <proto/proto_http.h>
 #include <proto/queue.h>
 #include <proto/sample.h>

src/ssl_sock.c

@@ -91,6 +91,7 @@
 #include <proto/fd.h>
 #include <proto/freq_ctr.h>
 #include <proto/frontend.h>
+#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/openssl-compat.h>
 #include <proto/pattern.h>

src/stick_table.c

@@ -29,6 +29,7 @@
 
 #include <proto/arg.h>
 #include <proto/cli.h>
+#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/proto_http.h>
 #include <proto/proto_tcp.h>

src/stream.c

@@ -43,6 +43,7 @@
 #include <proto/frontend.h>
 #include <proto/hdr_idx.h>
 #include <proto/hlua.h>
+#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/raw_sock.h>

src/vars.c

@@ -7,6 +7,7 @@
 #include <types/vars.h>
 
 #include <proto/arg.h>
+#include <proto/http_rules.h>
 #include <proto/proto_http.h>
 #include <proto/sample.h>
 #include <proto/stream.h>