[MAJOR] ported requri to use mempools v2
diff --git a/src/haproxy.c b/src/haproxy.c
index 7f5641c..ed26a54 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -664,7 +664,7 @@
pool_destroy2(pool2_session);
pool_destroy2(pool2_buffer);
- pool_destroy(pool_requri);
+ pool_destroy2(pool2_requri);
pool_destroy2(pool2_task);
pool_destroy(pool_capture);
pool_destroy2(pool2_appsess);
diff --git a/src/proto_http.c b/src/proto_http.c
index 51d265c..39d2a46 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -243,6 +243,9 @@
FD_SET(*tmp, url_encode_map);
tmp++;
}
+
+ /* memory allocations */
+ pool2_requri = create_pool("requri", REQURI_LEN, MEM_F_SHARED);
}
/*
@@ -624,7 +627,7 @@
const char sess_set_cookie[8] = "N1I3PD5R"; /* No set-cookie, unknown, Set-Cookie Inserted, unknown,
Set-cookie seen and left unchanged (passive), Set-cookie Deleted,
unknown, Set-cookie Rewritten */
-void **pool_requri = NULL;
+struct pool_head *pool2_requri;
/*
* send a log for the session when we have enough info about it.
@@ -1592,7 +1595,7 @@
*/
if (unlikely(t->logs.logwait & LW_REQ)) {
/* we have a complete HTTP request that we must log */
- if ((txn->uri = pool_alloc(requri)) != NULL) {
+ if ((txn->uri = pool_alloc2(pool2_requri)) != NULL) {
int urilen = msg->sl.rq.l;
if (urilen >= REQURI_LEN)
diff --git a/src/session.c b/src/session.c
index 1b574a0..4efc1ce 100644
--- a/src/session.c
+++ b/src/session.c
@@ -23,6 +23,7 @@
#include <proto/buffers.h>
#include <proto/hdr_idx.h>
+#include <proto/log.h>
#include <proto/session.h>
#include <proto/queue.h>
@@ -64,7 +65,7 @@
}
if (txn->uri)
- pool_free(requri, txn->uri);
+ pool_free2(pool2_requri, txn->uri);
if (txn->cli_cookie)
pool_free(capture, txn->cli_cookie);
if (txn->srv_cookie)