REORG: include: move common/h1.h to haproxy/h1.h
The file was moved as-is. There was a wrong dependency on dynbuf.h
instead of buf.h which was addressed. There was no benefit to
splitting this between types and functions.
diff --git a/include/common/h1.h b/include/haproxy/h1.h
similarity index 98%
rename from include/common/h1.h
rename to include/haproxy/h1.h
index 879e041..6ac1f61 100644
--- a/include/common/h1.h
+++ b/include/haproxy/h1.h
@@ -1,8 +1,8 @@
/*
- * include/common/h1.h
+ * include/haproxy/h1.h
* This file contains HTTP/1 protocol definitions.
*
- * Copyright (C) 2000-2017 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 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
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _COMMON_H1_H
-#define _COMMON_H1_H
+#ifndef _HAPROXY_H1_H
+#define _HAPROXY_H1_H
+#include <import/ist.h>
#include <haproxy/api.h>
-#include <haproxy/dynbuf.h>
-#include <haproxy/intops.h>
+#include <haproxy/buf.h>
#include <haproxy/http.h>
#include <haproxy/http-hdr-t.h>
-#include <import/ist.h>
+#include <haproxy/intops.h>
/* Possible states while parsing HTTP/1 messages (request|response) */
@@ -356,4 +356,4 @@
return h1m;
}
-#endif /* _COMMON_H1_H */
+#endif /* _HAPROXY_H1_H */
diff --git a/include/proto/h1_htx.h b/include/proto/h1_htx.h
index 02b9bdc..aa2c1f9 100644
--- a/include/proto/h1_htx.h
+++ b/include/proto/h1_htx.h
@@ -25,7 +25,7 @@
#include <haproxy/buf.h>
#include <import/ist.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl, struct htx *dsthtx,
struct buffer *srcbuf, size_t ofs, size_t max);
diff --git a/src/checks.c b/src/checks.c
index b0d6776..6f409e3 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -40,7 +40,7 @@
#include <haproxy/time.h>
#include <haproxy/thread.h>
#include <haproxy/http.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <common/htx.h>
#include <types/global.h>
diff --git a/src/h1.c b/src/h1.c
index f143db9..9ac575b 100644
--- a/src/h1.c
+++ b/src/h1.c
@@ -12,7 +12,7 @@
#include <ctype.h>
#include <haproxy/api.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <haproxy/http-hdr.h>
#include <proto/channel.h>
diff --git a/src/h1_htx.c b/src/h1_htx.c
index 83ebfb1..69472a6 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -12,7 +12,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <haproxy/http.h>
#include <common/htx.h>
diff --git a/src/hlua.c b/src/hlua.c
index 0a3362a..d73abec 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -28,7 +28,7 @@
#include <haproxy/thread.h>
#include <haproxy/regex.h>
#include <haproxy/xref.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <common/standard.h>
#include <types/cli.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 2d99642..3f30797 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -19,7 +19,7 @@
#include <haproxy/api.h>
#include <haproxy/base64.h>
#include <haproxy/chunk.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <haproxy/http.h>
#include <common/htx.h>
#include <haproxy/pool.h>
diff --git a/src/http_htx.c b/src/http_htx.c
index ede8a0e..d410f03 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -19,7 +19,7 @@
#include <types/global.h>
#include <common/cfgparse.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <haproxy/http.h>
#include <common/htx.h>
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 364e5cf..f58609e 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -13,7 +13,7 @@
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <common/fcgi.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <common/htx.h>
#include <import/ist.h>
#include <haproxy/list.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 963ed16..09bf871 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -12,7 +12,7 @@
#include <haproxy/api.h>
#include <haproxy/istbuf.h>
#include <common/cfgparse.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <common/h2.h>
#include <common/htx.h>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index fb4997c..d672f99 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -13,7 +13,7 @@
#include <haproxy/api.h>
#include <haproxy/istbuf.h>
#include <common/cfgparse.h>
-#include <common/h1.h>
+#include <haproxy/h1.h>
#include <common/h2.h>
#include <common/hpack-dec.h>
#include <common/hpack-enc.h>