MINOR: proxy/http_ana: Remove unused req_exp/rsp_exp and req_add/rsp_add lists
The keywords req* and rsp* are now unsupported. So the corresponding lists are
now unused. It is safe to remove them from the structure proxy.
As a result, the code dealing with these rules in HTTP analyzers was also
removed.
diff --git a/include/types/proxy.h b/include/types/proxy.h
index a57b073..a951a77 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -404,14 +404,11 @@
struct list format_unique_id; /* unique-id format */
int to_log; /* things to be logged (LW_*) */
int stop_time; /* date to stop listening, when stopping != 0 (int ticks) */
- struct hdr_exp *req_exp; /* regular expressions for request headers */
- struct hdr_exp *rsp_exp; /* regular expressions for response headers */
int nb_req_cap, nb_rsp_cap; /* # of headers to be captured */
struct cap_hdr *req_cap; /* chained list of request headers to be captured */
struct cap_hdr *rsp_cap; /* chained list of response headers to be captured */
struct pool_head *req_cap_pool, /* pools of pre-allocated char ** used to build the streams */
*rsp_cap_pool;
- struct list req_add, rsp_add; /* headers to be added */
struct be_counters be_counters; /* backend statistics counters */
struct fe_counters fe_counters; /* frontend statistics counters */
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index f324a63..1101a98 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -79,32 +79,6 @@
return 0;
}
-/* Report a warning if a rule is placed after a reqrewrite rule.
- * Return 1 if the warning has been emitted, otherwise 0.
- */
-int warnif_rule_after_reqxxx(struct proxy *proxy, const char *file, int line, const char *arg)
-{
- if (proxy->req_exp) {
- ha_warning("parsing [%s:%d] : a '%s' rule placed after a 'reqxxx' rule will still be processed before.\n",
- file, line, arg);
- return 1;
- }
- return 0;
-}
-
-/* Report a warning if a rule is placed after a reqadd rule.
- * Return 1 if the warning has been emitted, otherwise 0.
- */
-int warnif_rule_after_reqadd(struct proxy *proxy, const char *file, int line, const char *arg)
-{
- if (!LIST_ISEMPTY(&proxy->req_add)) {
- ha_warning("parsing [%s:%d] : a '%s' rule placed after a 'reqadd' rule will still be processed before.\n",
- file, line, arg);
- return 1;
- }
- return 0;
-}
-
/* Report a warning if a rule is placed after a redirect rule.
* Return 1 if the warning has been emitted, otherwise 0.
*/
@@ -151,25 +125,11 @@
warnif_rule_after_use_server(proxy, file, line, arg);
}
-/* report a warning if a reqadd rule is dangerously placed */
-int warnif_misplaced_reqadd(struct proxy *proxy, const char *file, int line, const char *arg)
-{
- return warnif_rule_after_redirect(proxy, file, line, arg) ||
- warnif_misplaced_redirect(proxy, file, line, arg);
-}
-
-/* report a warning if a reqxxx rule is dangerously placed */
-int warnif_misplaced_reqxxx(struct proxy *proxy, const char *file, int line, const char *arg)
-{
- return warnif_rule_after_reqadd(proxy, file, line, arg) ||
- warnif_misplaced_reqadd(proxy, file, line, arg);
-}
-
/* report a warning if an http-request rule is dangerously placed */
int warnif_misplaced_http_req(struct proxy *proxy, const char *file, int line, const char *arg)
{
- return warnif_rule_after_reqxxx(proxy, file, line, arg) ||
- warnif_misplaced_reqxxx(proxy, file, line, arg);;
+ return warnif_rule_after_redirect(proxy, file, line, arg) ||
+ warnif_misplaced_redirect(proxy, file, line, arg);
}
/* report a warning if a block rule is dangerously placed */
diff --git a/src/haproxy.c b/src/haproxy.c
index 4e24ca3..dd0c3ec 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2181,13 +2181,11 @@
struct server *s,*s_next;
struct listener *l,*l_next;
struct acl_cond *cond, *condb;
- struct hdr_exp *exp, *expb;
struct acl *acl, *aclb;
struct switching_rule *rule, *ruleb;
struct server_rule *srule, *sruleb;
struct redirect_rule *rdr, *rdrb;
struct wordlist *wl, *wlb;
- struct cond_wordlist *cwl, *cwlb;
struct uri_auth *uap, *ua = NULL;
struct logsrv *log, *logb;
struct logformat_node *lf, *lfb;
@@ -2225,40 +2223,12 @@
for (i = 0; i < HTTP_ERR_SIZE; i++)
chunk_destroy(&p->errmsg[i]);
- list_for_each_entry_safe(cwl, cwlb, &p->req_add, list) {
- LIST_DEL(&cwl->list);
- free(cwl->s);
- free(cwl);
- }
-
- list_for_each_entry_safe(cwl, cwlb, &p->rsp_add, list) {
- LIST_DEL(&cwl->list);
- free(cwl->s);
- free(cwl);
- }
-
list_for_each_entry_safe(cond, condb, &p->mon_fail_cond, list) {
LIST_DEL(&cond->list);
prune_acl_cond(cond);
free(cond);
}
- for (exp = p->req_exp; exp != NULL; ) {
- regex_free(exp->preg);
- free((char *)exp->replace);
- expb = exp;
- exp = exp->next;
- free(expb);
- }
-
- for (exp = p->rsp_exp; exp != NULL; ) {
- regex_free(exp->preg);
- free((char *)exp->replace);
- expb = exp;
- exp = exp->next;
- free(expb);
- }
-
/* build a list of unique uri_auths */
if (!ua)
ua = p->uri_auth;
diff --git a/src/http_ana.c b/src/http_ana.c
index fc03751..9e876cd 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -47,16 +47,12 @@
static void http_capture_headers(struct htx *htx, char **cap, struct cap_hdr *cap_hdr);
static int http_del_hdr_value(char *start, char *end, char **from, char *next);
static size_t http_fmt_req_line(const struct htx_sl *sl, char *str, size_t len);
-static size_t http_fmt_res_line(const struct htx_sl *sl, char *str, size_t len);
static void http_debug_stline(const char *dir, struct stream *s, const struct htx_sl *sl);
static void http_debug_hdr(const char *dir, struct stream *s, const struct ist n, const struct ist v);
static enum rule_result http_req_get_intercept_rule(struct proxy *px, struct list *rules, struct stream *s, int *deny_status);
static enum rule_result http_res_get_intercept_rule(struct proxy *px, struct list *rules, struct stream *s);
-static int http_apply_filters_to_request(struct stream *s, struct channel *req, struct proxy *px);
-static int http_apply_filters_to_response(struct stream *s, struct channel *res, struct proxy *px);
-
static void http_manage_client_side_cookies(struct stream *s, struct channel *req);
static void http_manage_server_side_cookies(struct stream *s, struct channel *res);
@@ -470,7 +466,6 @@
struct http_msg *msg = &txn->req;
struct htx *htx;
struct redirect_rule *rule;
- struct cond_wordlist *wl;
enum rule_result verdict;
int deny_status = HTTP_ERR_403;
struct connection *conn = objt_conn(sess->origin);
@@ -565,37 +560,6 @@
goto return_prx_cond;
}
- /* evaluate the req* rules except reqadd */
- if (px->req_exp != NULL) {
- if (http_apply_filters_to_request(s, req, px) < 0)
- goto return_bad_req;
-
- if (txn->flags & TX_CLDENY)
- goto deny;
-
- if (txn->flags & TX_CLTARPIT) {
- deny_status = HTTP_ERR_500;
- goto tarpit;
- }
- }
-
- /* add request headers from the rule sets in the same order */
- list_for_each_entry(wl, &px->req_add, list) {
- struct ist n,v;
- if (wl->cond) {
- int ret = acl_exec_cond(wl->cond, px, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL);
- ret = acl_pass(ret);
- if (((struct acl_cond *)wl->cond)->pol == ACL_COND_UNLESS)
- ret = !ret;
- if (!ret)
- continue;
- }
-
- http_parse_header(ist2(wl->s, strlen(wl->s)), &n, &v);
- if (unlikely(!http_add_header(htx, n, v)))
- goto return_bad_req;
- }
-
/* Proceed with the applets now. */
if (unlikely(objt_applet(s->target))) {
if (sess->fe == s->be) /* report it if the request was intercepted by the frontend */
@@ -1838,7 +1802,6 @@
struct http_msg *msg = &txn->rsp;
struct htx *htx;
struct proxy *cur_proxy;
- struct cond_wordlist *wl;
enum rule_result ret = HTTP_RULE_RES_CONT;
if (unlikely(msg->msg_state < HTTP_MSG_BODY)) /* we need more data */
@@ -1887,8 +1850,6 @@
else
cur_proxy = s->be;
while (1) {
- struct proxy *rule_set = cur_proxy;
-
/* evaluate http-response rules */
if (ret == HTTP_RULE_RES_CONT) {
ret = http_res_get_intercept_rule(cur_proxy, &cur_proxy->http_res_rules, s);
@@ -1909,12 +1870,6 @@
return 0;
}
- /* try headers filters */
- if (rule_set->rsp_exp != NULL) {
- if (http_apply_filters_to_response(s, rep, rule_set) < 0)
- goto return_bad_resp;
- }
-
/* has the response been denied ? */
if (txn->flags & TX_SVDENY) {
if (objt_server(s->target))
@@ -1927,25 +1882,6 @@
goto return_srv_prx_502;
}
- /* add response headers from the rule sets in the same order */
- list_for_each_entry(wl, &rule_set->rsp_add, list) {
- struct ist n, v;
- if (txn->status < 200 && txn->status != 101)
- break;
- if (wl->cond) {
- int ret = acl_exec_cond(wl->cond, px, sess, s, SMP_OPT_DIR_RES|SMP_OPT_FINAL);
- ret = acl_pass(ret);
- if (((struct acl_cond *)wl->cond)->pol == ACL_COND_UNLESS)
- ret = !ret;
- if (!ret)
- continue;
- }
-
- http_parse_header(ist2(wl->s, strlen(wl->s)), &n, &v);
- if (unlikely(!http_add_header(htx, n, v)))
- goto return_bad_resp;
- }
-
/* check whether we're already working on the frontend */
if (cur_proxy == sess->fe)
break;
@@ -3495,433 +3431,6 @@
return rule_ret;
}
-/* Iterate the same filter through all request headers.
- * Returns 1 if this filter can be stopped upon return, otherwise 0.
- * Since it can manage the switch to another backend, it updates the per-proxy
- * DENY stats.
- */
-static int http_apply_filter_to_req_headers(struct stream *s, struct channel *req, struct hdr_exp *exp)
-{
- struct http_txn *txn = s->txn;
- struct htx *htx;
- struct buffer *hdr = get_trash_chunk();
- int32_t pos;
-
- htx = htxbuf(&req->buf);
-
- for (pos = htx_get_first(htx); pos != -1; pos = htx_get_next(htx, pos)) {
- struct htx_blk *blk = htx_get_blk(htx, pos);
- enum htx_blk_type type;
- struct ist n, v;
-
- next_hdr:
- type = htx_get_blk_type(blk);
- if (type == HTX_BLK_EOH)
- break;
- if (type != HTX_BLK_HDR)
- continue;
-
- if (unlikely(txn->flags & (TX_CLDENY | TX_CLTARPIT)))
- return 1;
- else if (unlikely(txn->flags & TX_CLALLOW) &&
- (exp->action == ACT_ALLOW ||
- exp->action == ACT_DENY ||
- exp->action == ACT_TARPIT))
- return 0;
-
- n = htx_get_blk_name(htx, blk);
- v = htx_get_blk_value(htx, blk);
-
- chunk_memcpy(hdr, n.ptr, n.len);
- hdr->area[hdr->data++] = ':';
- hdr->area[hdr->data++] = ' ';
- chunk_memcat(hdr, v.ptr, v.len);
-
- /* Now we have one header in <hdr> */
-
- if (regex_exec_match2(exp->preg, hdr->area, hdr->data, MAX_MATCH, pmatch, 0)) {
- struct http_hdr_ctx ctx;
- int len;
-
- switch (exp->action) {
- case ACT_ALLOW:
- txn->flags |= TX_CLALLOW;
- goto end;
-
- case ACT_DENY:
- txn->flags |= TX_CLDENY;
- goto end;
-
- case ACT_TARPIT:
- txn->flags |= TX_CLTARPIT;
- goto end;
-
- case ACT_REPLACE:
- len = exp_replace(trash.area, trash.size, hdr->area, exp->replace, pmatch);
- if (len < 0)
- return -1;
-
- http_parse_header(ist2(trash.area, len), &n, &v);
- ctx.blk = blk;
- ctx.value = v;
- ctx.lws_before = ctx.lws_after = 0;
- if (!http_replace_header(htx, &ctx, n, v))
- return -1;
- if (!ctx.blk)
- goto end;
- pos = htx_get_blk_pos(htx, blk);
- break;
-
- case ACT_REMOVE:
- ctx.blk = blk;
- ctx.value = v;
- ctx.lws_before = ctx.lws_after = 0;
- if (!http_remove_header(htx, &ctx))
- return -1;
- if (!ctx.blk)
- goto end;
- pos = htx_get_blk_pos(htx, blk);
- goto next_hdr;
-
- }
- }
- }
- end:
- return 0;
-}
-
-/* Apply the filter to the request line.
- * Returns 0 if nothing has been done, 1 if the filter has been applied,
- * or -1 if a replacement resulted in an invalid request line.
- * Since it can manage the switch to another backend, it updates the per-proxy
- * DENY stats.
- */
-static int http_apply_filter_to_req_line(struct stream *s, struct channel *req, struct hdr_exp *exp)
-{
- struct http_txn *txn = s->txn;
- struct htx *htx;
- struct buffer *reqline = get_trash_chunk();
- int done;
-
- htx = htxbuf(&req->buf);
-
- if (unlikely(txn->flags & (TX_CLDENY | TX_CLTARPIT)))
- return 1;
- else if (unlikely(txn->flags & TX_CLALLOW) &&
- (exp->action == ACT_ALLOW ||
- exp->action == ACT_DENY ||
- exp->action == ACT_TARPIT))
- return 0;
- else if (exp->action == ACT_REMOVE)
- return 0;
-
- done = 0;
-
- reqline->data = http_fmt_req_line(http_get_stline(htx), reqline->area, reqline->size);
-
- /* Now we have the request line between cur_ptr and cur_end */
- if (regex_exec_match2(exp->preg, reqline->area, reqline->data, MAX_MATCH, pmatch, 0)) {
- struct htx_sl *sl = http_get_stline(htx);
- struct ist meth, uri, vsn;
- int len;
-
- switch (exp->action) {
- case ACT_ALLOW:
- txn->flags |= TX_CLALLOW;
- done = 1;
- break;
-
- case ACT_DENY:
- txn->flags |= TX_CLDENY;
- done = 1;
- break;
-
- case ACT_TARPIT:
- txn->flags |= TX_CLTARPIT;
- done = 1;
- break;
-
- case ACT_REPLACE:
- len = exp_replace(trash.area, trash.size, reqline->area, exp->replace, pmatch);
- if (len < 0)
- return -1;
-
- http_parse_stline(ist2(trash.area, len), &meth, &uri, &vsn);
- sl->info.req.meth = find_http_meth(meth.ptr, meth.len);
- if (!http_replace_stline(htx, meth, uri, vsn))
- return -1;
- done = 1;
- break;
- }
- }
- return done;
-}
-
-/*
- * Apply all the req filters of proxy <px> to all headers in buffer <req> of stream <s>.
- * Returns 0 if everything is alright, or -1 in case a replacement lead to an
- * unparsable request. Since it can manage the switch to another backend, it
- * updates the per-proxy DENY stats.
- */
-static int http_apply_filters_to_request(struct stream *s, struct channel *req, struct proxy *px)
-{
- struct session *sess = s->sess;
- struct http_txn *txn = s->txn;
- struct hdr_exp *exp;
-
- for (exp = px->req_exp; exp; exp = exp->next) {
- int ret;
-
- /*
- * The interleaving of transformations and verdicts
- * makes it difficult to decide to continue or stop
- * the evaluation.
- */
-
- if (txn->flags & (TX_CLDENY|TX_CLTARPIT))
- break;
-
- if ((txn->flags & TX_CLALLOW) &&
- (exp->action == ACT_ALLOW || exp->action == ACT_DENY ||
- exp->action == ACT_TARPIT || exp->action == ACT_PASS))
- continue;
-
- /* if this filter had a condition, evaluate it now and skip to
- * next filter if the condition does not match.
- */
- if (exp->cond) {
- ret = acl_exec_cond(exp->cond, px, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL);
- ret = acl_pass(ret);
- if (((struct acl_cond *)exp->cond)->pol == ACL_COND_UNLESS)
- ret = !ret;
-
- if (!ret)
- continue;
- }
-
- /* Apply the filter to the request line. */
- ret = http_apply_filter_to_req_line(s, req, exp);
- if (unlikely(ret < 0))
- return -1;
-
- if (likely(ret == 0)) {
- /* The filter did not match the request, it can be
- * iterated through all headers.
- */
- if (unlikely(http_apply_filter_to_req_headers(s, req, exp) < 0))
- return -1;
- }
- }
- return 0;
-}
-
-/* Iterate the same filter through all response headers contained in <res>.
- * Returns 1 if this filter can be stopped upon return, otherwise 0.
- */
-static int http_apply_filter_to_resp_headers(struct stream *s, struct channel *res, struct hdr_exp *exp)
-{
- struct http_txn *txn = s->txn;
- struct htx *htx;
- struct buffer *hdr = get_trash_chunk();
- int32_t pos;
-
- htx = htxbuf(&res->buf);
-
- for (pos = htx_get_first(htx); pos != -1; pos = htx_get_next(htx, pos)) {
- struct htx_blk *blk = htx_get_blk(htx, pos);
- enum htx_blk_type type;
- struct ist n, v;
-
- next_hdr:
- type = htx_get_blk_type(blk);
- if (type == HTX_BLK_EOH)
- break;
- if (type != HTX_BLK_HDR)
- continue;
-
- if (unlikely(txn->flags & TX_SVDENY))
- return 1;
- else if (unlikely(txn->flags & TX_SVALLOW) &&
- (exp->action == ACT_ALLOW ||
- exp->action == ACT_DENY))
- return 0;
-
- n = htx_get_blk_name(htx, blk);
- v = htx_get_blk_value(htx, blk);
-
- chunk_memcpy(hdr, n.ptr, n.len);
- hdr->area[hdr->data++] = ':';
- hdr->area[hdr->data++] = ' ';
- chunk_memcat(hdr, v.ptr, v.len);
-
- /* Now we have one header in <hdr> */
-
- if (regex_exec_match2(exp->preg, hdr->area, hdr->data, MAX_MATCH, pmatch, 0)) {
- struct http_hdr_ctx ctx;
- int len;
-
- switch (exp->action) {
- case ACT_ALLOW:
- txn->flags |= TX_SVALLOW;
- goto end;
- break;
-
- case ACT_DENY:
- txn->flags |= TX_SVDENY;
- goto end;
- break;
-
- case ACT_REPLACE:
- len = exp_replace(trash.area, trash.size, hdr->area, exp->replace, pmatch);
- if (len < 0)
- return -1;
-
- http_parse_header(ist2(trash.area, len), &n, &v);
- ctx.blk = blk;
- ctx.value = v;
- ctx.lws_before = ctx.lws_after = 0;
- if (!http_replace_header(htx, &ctx, n, v))
- return -1;
- if (!ctx.blk)
- goto end;
- pos = htx_get_blk_pos(htx, blk);
- break;
-
- case ACT_REMOVE:
- ctx.blk = blk;
- ctx.value = v;
- ctx.lws_before = ctx.lws_after = 0;
- if (!http_remove_header(htx, &ctx))
- return -1;
- if (!ctx.blk)
- goto end;
- pos = htx_get_blk_pos(htx, blk);
- goto next_hdr;
- }
- }
-
- }
- end:
- return 0;
-}
-
-/* Apply the filter to the status line in the response buffer <res>.
- * Returns 0 if nothing has been done, 1 if the filter has been applied,
- * or -1 if a replacement resulted in an invalid status line.
- */
-static int http_apply_filter_to_sts_line(struct stream *s, struct channel *res, struct hdr_exp *exp)
-{
- struct http_txn *txn = s->txn;
- struct htx *htx;
- struct buffer *resline = get_trash_chunk();
- int done;
-
- htx = htxbuf(&res->buf);
-
- if (unlikely(txn->flags & TX_SVDENY))
- return 1;
- else if (unlikely(txn->flags & TX_SVALLOW) &&
- (exp->action == ACT_ALLOW ||
- exp->action == ACT_DENY))
- return 0;
- else if (exp->action == ACT_REMOVE)
- return 0;
-
- done = 0;
- resline->data = http_fmt_res_line(http_get_stline(htx), resline->area, resline->size);
-
- /* Now we have the status line between cur_ptr and cur_end */
- if (regex_exec_match2(exp->preg, resline->area, resline->data, MAX_MATCH, pmatch, 0)) {
- struct htx_sl *sl = http_get_stline(htx);
- struct ist vsn, code, reason;
- int len;
-
- switch (exp->action) {
- case ACT_ALLOW:
- txn->flags |= TX_SVALLOW;
- done = 1;
- break;
-
- case ACT_DENY:
- txn->flags |= TX_SVDENY;
- done = 1;
- break;
-
- case ACT_REPLACE:
- len = exp_replace(trash.area, trash.size, resline->area, exp->replace, pmatch);
- if (len < 0)
- return -1;
-
- http_parse_stline(ist2(trash.area, len), &vsn, &code, &reason);
- sl->info.res.status = strl2ui(code.ptr, code.len);
- if (!http_replace_stline(htx, vsn, code, reason))
- return -1;
-
- done = 1;
- return 1;
- }
- }
- return done;
-}
-
-/*
- * Apply all the resp filters of proxy <px> to all headers in buffer <res> of stream <s>.
- * Returns 0 if everything is alright, or -1 in case a replacement lead to an
- * unparsable response.
- */
-static int http_apply_filters_to_response(struct stream *s, struct channel *res, struct proxy *px)
-{
- struct session *sess = s->sess;
- struct http_txn *txn = s->txn;
- struct hdr_exp *exp;
-
- for (exp = px->rsp_exp; exp; exp = exp->next) {
- int ret;
-
- /*
- * The interleaving of transformations and verdicts
- * makes it difficult to decide to continue or stop
- * the evaluation.
- */
-
- if (txn->flags & TX_SVDENY)
- break;
-
- if ((txn->flags & TX_SVALLOW) &&
- (exp->action == ACT_ALLOW || exp->action == ACT_DENY ||
- exp->action == ACT_PASS)) {
- exp = exp->next;
- continue;
- }
-
- /* if this filter had a condition, evaluate it now and skip to
- * next filter if the condition does not match.
- */
- if (exp->cond) {
- ret = acl_exec_cond(exp->cond, px, sess, s, SMP_OPT_DIR_RES|SMP_OPT_FINAL);
- ret = acl_pass(ret);
- if (((struct acl_cond *)exp->cond)->pol == ACL_COND_UNLESS)
- ret = !ret;
- if (!ret)
- continue;
- }
-
- /* Apply the filter to the status line. */
- ret = http_apply_filter_to_sts_line(s, res, exp);
- if (unlikely(ret < 0))
- return -1;
-
- if (likely(ret == 0)) {
- /* The filter did not match the response, it can be
- * iterated through all headers.
- */
- if (unlikely(http_apply_filter_to_resp_headers(s, res, exp) < 0))
- return -1;
- }
- }
- return 0;
-}
-
/*
* Manage client-side cookie. It can impact performance by about 2% so it is
* desirable to call it only when needed. This code is quite complex because
@@ -5712,31 +5221,6 @@
return dst.len;
}
-/* Formats the start line of the response (without CRLF) and puts it in <str> and
- * return the written length. The line can be truncated if it exceeds <len>.
- */
-static size_t http_fmt_res_line(const struct htx_sl *sl, char *str, size_t len)
-{
- struct ist dst = ist2(str, 0);
-
- if (istcat(&dst, htx_sl_res_vsn(sl), len) == -1)
- goto end;
- if (dst.len + 1 > len)
- goto end;
- dst.ptr[dst.len++] = ' ';
-
- if (istcat(&dst, htx_sl_res_code(sl), len) == -1)
- goto end;
- if (dst.len + 1 > len)
- goto end;
- dst.ptr[dst.len++] = ' ';
-
- istcat(&dst, htx_sl_res_reason(sl), len);
- end:
- return dst.len;
-}
-
-
/*
* Print a debug line with a start line.
*/
diff --git a/src/proxy.c b/src/proxy.c
index eba6ec7..91e04a2 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -814,14 +814,6 @@
ha_warning("config : cookie will be ignored for %s '%s' (needs 'mode http').\n",
proxy_type_str(curproxy), curproxy->id);
}
- if (curproxy->rsp_exp != NULL) {
- ha_warning("config : server regular expressions will be ignored for %s '%s' (needs 'mode http').\n",
- proxy_type_str(curproxy), curproxy->id);
- }
- if (curproxy->req_exp != NULL) {
- ha_warning("config : client regular expressions will be ignored for %s '%s' (needs 'mode http').\n",
- proxy_type_str(curproxy), curproxy->id);
- }
if (curproxy->monitor_uri != NULL) {
ha_warning("config : monitor-uri will be ignored for %s '%s' (needs 'mode http').\n",
proxy_type_str(curproxy), curproxy->id);
@@ -873,8 +865,6 @@
LIST_INIT(&p->tcp_rep.inspect_rules);
LIST_INIT(&p->tcp_req.l4_rules);
LIST_INIT(&p->tcp_req.l5_rules);
- LIST_INIT(&p->req_add);
- LIST_INIT(&p->rsp_add);
LIST_INIT(&p->listener_queue);
LIST_INIT(&p->logsrvs);
LIST_INIT(&p->logformat);