REORG: include: move fcgi-app.h to haproxy/fcgi-app{,-t}.h

Only arg-t.h was missing from the types to get arg_list.

diff --git a/include/types/fcgi-app.h b/include/haproxy/fcgi-app-t.h
similarity index 95%
rename from include/types/fcgi-app.h
rename to include/haproxy/fcgi-app-t.h
index 4d1581b48b15b356ae523322a19f97a304ab5b26..602310da951c408ed4d5d82ed023285bcabae25f 100644 (file)
--- a/include/types/fcgi-app.h
+++ b/include/haproxy/fcgi-app-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/fcgi-app.h
+ * include/haproxy/fcgi-app-t.h
  * This file defines everything related to FCGI applications.
  *
  * Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
@@ -19,18 +19,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_HTTP_FCGI_H
-#define _TYPES_HTTP_FCGI_H
+#ifndef _HAPROXY_HTTP_FCGI_T_H
+#define _HAPROXY_HTTP_FCGI_T_H
 
-#include <haproxy/acl-t.h>
-#include <haproxy/api-t.h>
+#include <import/ebpttree.h>
 #include <import/ist.h>
+
+#include <haproxy/acl-t.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/fcgi.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
-
-#include <import/ebistree.h>
+#include <haproxy/api-t.h>
 
 #define FCGI_APP_FL_KEEP_CONN     0x00000001 /* Keep the connection alive */
 #define FCGI_APP_FL_GET_VALUES    0x00000002 /* Retrieve FCGI variables on connection establishment */
@@ -113,7 +114,7 @@ struct fcgi_flt_ctx {
        struct fcgi_app *app;
 };
 
-#endif /* _TYPES_HTTP_FCGI_H */
+#endif /* _HAPROXY_HTTP_FCGI_T_H */
 
 /*
  * Local variables:

diff --git a/include/proto/fcgi-app.h b/include/haproxy/fcgi-app.h
similarity index 88%
rename from include/proto/fcgi-app.h
rename to include/haproxy/fcgi-app.h
index 424d018a4a12ec8957c6fade554c248eb5067e3b..becfdde9c3ed39bc7a53ab749a940a4f8d1e1c35 100644 (file)
--- a/include/proto/fcgi-app.h
+++ b/include/haproxy/fcgi-app.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/fcgi-app.h
+ * include/haproxy/fcgi-app.h
  * This file defines function prototypes for FCGI applications.
  *
  * Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
@@ -19,12 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_HTTP_FCGI_H
-#define _PROTO_HTTP_FCGI_H
+#ifndef _HAPROXY_HTTP_FCGI_H
+#define _HAPROXY_HTTP_FCGI_H
 
-#include <haproxy/htx.h>
-
-#include <types/fcgi-app.h>
+#include <haproxy/fcgi-app-t.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
@@ -34,7 +32,7 @@ struct fcgi_flt_ctx *find_strm_fcgi_ctx(struct stream *s);
 struct fcgi_app *get_px_fcgi_app(struct proxy *px);
 struct fcgi_app *get_strm_fcgi_app(struct stream *s);
 
-#endif /* _PROTO_HTTP_FCGI_H */
+#endif /* _HAPROXY_HTTP_FCGI_H */
 
 /*
  * Local variables:

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 9097dab9d8f58ac9f1fe7d17f3d8360cfc2dde3d..629c67792b6815a7195ff86fa2219bba3aa0b1a8 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -15,6 +15,7 @@
 #include <haproxy/chunk.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/fcgi-app.h>
 #include <haproxy/filters.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
@@ -25,7 +26,6 @@
 
 #include <haproxy/global.h>
 
-#include <proto/fcgi-app.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index c429faa5a9a2bec5ead3e1924dd973e3ef04e8d7..2bb58626208e461477572fe5514bd2247fe2e024 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -14,6 +14,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/fcgi.h>
+#include <haproxy/fcgi-app.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http_htx.h>
@@ -28,7 +29,6 @@
 
 #include <types/proxy.h>
 
-#include <proto/fcgi-app.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 #include <haproxy/trace.h>