REORG: include: move http_ana.h to haproxy/http_ana{,-t}.h
It was moved without any change, however many callers didn't need it at
all. This was a consequence of the split of proto_http.c into several
parts that resulted in many locations to still reference it.
diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index 0f99223..f363326 100644
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -33,7 +33,6 @@
#include <haproxy/regex-t.h>
#include <haproxy/xref-t.h>
-#include <types/http_ana.h>
#include <types/proxy.h>
#include <types/server.h>
#include <haproxy/stick_table-t.h>
diff --git a/include/types/http_ana.h b/include/haproxy/http_ana-t.h
similarity index 97%
rename from include/types/http_ana.h
rename to include/haproxy/http_ana-t.h
index 6ebe772..1611924 100644
--- a/include/types/http_ana.h
+++ b/include/haproxy/http_ana-t.h
@@ -1,5 +1,5 @@
/*
- * include/types/http_ana.h
+ * include/haproxy/http_ana-t.h
* This file contains HTTP protocol definitions.
*
* Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,13 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_PROTO_HTTP_H
-#define _TYPES_PROTO_HTTP_H
+#ifndef _HAPROXY_PROTO_HTTP_T_H
+#define _HAPROXY_PROTO_HTTP_T_H
#include <haproxy/channel-t.h>
-#include <haproxy/api-t.h>
#include <haproxy/http-t.h>
-#include <haproxy/http_htx-t.h>
+#include <haproxy/api-t.h>
/* These are the flags that are found in txn->flags */
@@ -186,9 +185,7 @@
struct http_auth_data auth; /* HTTP auth data */
};
-extern struct pool_head *pool_head_http_txn;
-
-#endif /* _TYPES_PROTO_HTTP_H */
+#endif /* _HAPROXY_PROTO_HTTP_T_H */
/*
* Local variables:
diff --git a/include/proto/http_ana.h b/include/haproxy/http_ana.h
similarity index 94%
rename from include/proto/http_ana.h
rename to include/haproxy/http_ana.h
index 8648865..6bf4a5a 100644
--- a/include/proto/http_ana.h
+++ b/include/haproxy/http_ana.h
@@ -1,5 +1,5 @@
/*
- * include/proto/http_ana.h
+ * include/haproxy/http_ana.h
* This file contains HTTP protocol definitions.
*
* Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
@@ -19,16 +19,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_PROTO_HTTP_H
-#define _PROTO_PROTO_HTTP_H
+#ifndef _HAPROXY_PROTO_HTTP_H
+#define _HAPROXY_PROTO_HTTP_H
#include <haproxy/api.h>
#include <haproxy/channel-t.h>
-#include <haproxy/htx.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
+#include <haproxy/htx-t.h>
#include <types/stream.h>
extern struct pool_head *pool_head_uniqueid;
+extern struct pool_head *pool_head_http_txn;
int http_wait_for_request(struct stream *s, struct channel *req, int an_bit);
int http_process_req_common(struct stream *s, struct channel *req, int an_bit, struct proxy *px);
@@ -78,7 +79,7 @@
}
}
-#endif /* _PROTO_PROTO_HTTP_H */
+#endif /* _HAPROXY_PROTO_HTTP_H */
/*
* Local variables:
diff --git a/include/proto/filters.h b/include/proto/filters.h
index 9e8cc74..4b8876e 100644
--- a/include/proto/filters.h
+++ b/include/proto/filters.h
@@ -23,7 +23,7 @@
#include <haproxy/channel.h>
#include <types/filters.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
#include <types/proxy.h>
#include <types/stream.h>
diff --git a/include/types/stream.h b/include/types/stream.h
index 2a5fb77..99dfd02 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -32,6 +32,7 @@
#include <haproxy/channel-t.h>
#include <haproxy/dynbuf-t.h>
#include <haproxy/hlua-t.h>
+#include <haproxy/http_ana-t.h>
#include <haproxy/list-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/session-t.h>
@@ -39,7 +40,6 @@
#include <haproxy/vars-t.h>
#include <types/filters.h>
-#include <types/http_ana.h>
#include <types/proxy.h>
#include <types/queue.h>
#include <types/server.h>