8609cc44e7
- BUG/MEDIUM: backend: correctly detect the domain when use_domain_only is used
- MINOR: ssl: load certificates in alphabetical order
- BUG/MINOR: checks: prevent http keep-alive with http-check expect
- BUG/MEDIUM: Do not set agent health to zero if server is disabled in config
- MEDIUM/BUG: Only explicitly report "DOWN (agent)" if the agent health is zero
- BUG/MINOR: stats:Fix incorrect printf type.
- DOC: add missing entry for log-format and clarify the text
- BUG/MEDIUM: http: fix header removal when previous header ends with pure LF
- BUG/MEDIUM: channel: fix possible integer overflow on reserved size computation
- BUG/MINOR: channel: compare to_forward with buf->i, not buf->size
- MINOR: channel: add channel_in_transit()
- MEDIUM: channel: make buffer_reserved() use channel_in_transit()
- MEDIUM: channel: make bi_avail() use channel_in_transit()
- BUG/MEDIUM: channel: don't schedule data in transit for leaving until connected
- BUG/MAJOR: log: don't try to emit a log if no logger is set
- BUG/MINOR: args: add missing entry for ARGT_MAP in arg_type_names
- BUG/MEDIUM: http: make http-request set-header compute the string before removal
- BUG/MINOR: http: fix incorrect header value offset in replace-hdr/replace-value
- BUG/MINOR: http: abort request processing on filter failure
- BUG/MINOR: pattern: error message missing
- BUG/MEDIUM: pattern: some entries are not deleted with case insensitive match
Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
30 lines
874 B
Diff
30 lines
874 B
Diff
From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001
|
|
From: Thierry FOURNIER <tfournier@exceliance.fr>
|
|
Date: Fri, 6 Feb 2015 17:50:55 +0100
|
|
Subject: [PATCH 1/2] BUG/MINOR: pattern: error message missing
|
|
|
|
This patch must be backported in 1.5 version.
|
|
(cherry picked from commit 8aa8384e22dd0b66ded00c70a9c6034278b4bb69)
|
|
---
|
|
src/pattern.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/pattern.c b/src/pattern.c
|
|
index 208e33a..a6fc52d 100644
|
|
--- a/src/pattern.c
|
|
+++ b/src/pattern.c
|
|
@@ -989,8 +989,10 @@ int pat_idx_list_ptr(struct pattern_expr *expr, struct pattern *pat, char **err)
|
|
|
|
/* allocate pattern */
|
|
patl = calloc(1, sizeof(*patl));
|
|
- if (!patl)
|
|
+ if (!patl) {
|
|
+ memprintf(err, "out of memory while indexing pattern");
|
|
return 0;
|
|
+ }
|
|
|
|
/* duplicate pattern */
|
|
memcpy(&patl->pat, pat, sizeof(*pat));
|
|
--
|
|
2.0.4
|
|
|