forked from pool/haproxy
26c4149063
- Backport patches from upstream:
- BUG/MINOR: http: remove stupid HTTP_METH_NONE entry
- BUG/MAJOR: http: don't call http_send_name_header() after an error
- Add 0014-BUG-MINOR-http-remove-stupid-HTTP_METH_NONE-entry.patch
- Add 0015-BUG-MAJOR-http-don-t-call-http_send_name_header-afte.patch
- Backport patches from upstream:
- BUG/MINOR: log: missing some ARGC_* entries in fmt_directives()
- DOC: usesrc root privileges requirements
- BUILD: ssl: Allow building against libssl without SSLv3.
- DOC/MINOR: fix OpenBSD versions where haproxy works
- BUG/MINOR: http/sample: gmtime/localtime can fail
- DOC: typo in 'redirect', 302 code meaning
- DOC: mention that %ms is left-padded with zeroes.
- CLEANUP: .gitignore: ignore more test files
- CLEANUP: .gitignore: finally ignore everything but what is known.
- MEDIUM: config: emit a warning on a frontend without listener
- BUG/MEDIUM: counters: ensure that src_{inc,clr}_gpc0 creates a missing entry
- DOC: ssl: missing LF
- DOC: fix example of http-request using ssl_fc_session_id
- Add 0001-BUG-MINOR-log-missing-some-ARGC_-entries-in-fmt_dire.patch
- Add 0002-DOC-usesrc-root-privileges-requirements.patch
- Add 0003-BUILD-ssl-Allow-building-against-libssl-without-SSLv.patch
- Add 0004-DOC-MINOR-fix-OpenBSD-versions-where-haproxy-works.patch
- Add 0005-BUG-MINOR-http-sample-gmtime-localtime-can-fail.patch
- Add 0006-DOC-typo-in-redirect-302-code-meaning.patch
- Add 0007-DOC-mention-that-ms-is-left-padded-with-zeroes.patch
- Add 0008-CLEANUP-.gitignore-ignore-more-test-files.patch
- Add 0009-CLEANUP-.gitignore-finally-ignore-everything-but-wha.patch
- Add 0010-MEDIUM-config-emit-a-warning-on-a-frontend-without-l.patch (forwarded request 329653 from KGronlund)
OBS-URL: https://build.opensuse.org/request/show/329654
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=32
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 955587271031d66e9b7a768e3bb18dae00b60cc6 Mon Sep 17 00:00:00 2001
|
|
From: Thierry FOURNIER <tfournier@arpalert.org>
|
|
Date: Wed, 8 Jul 2015 00:15:20 +0200
|
|
Subject: [PATCH 05/11] BUG/MINOR: http/sample: gmtime/localtime can fail
|
|
|
|
The man said that gmtime() and localtime() can return a NULL value.
|
|
This is not tested. It appears that all the values of a 32 bit integer
|
|
are valid, but it is better to check the return of these functions.
|
|
|
|
However, if the integer move from 32 bits to 64 bits, some 64 values
|
|
can be unsupported.
|
|
(cherry picked from commit fac9ccfb705702f211f99e67d5f5d5129002086a)
|
|
[wt: we only have sample_conv_date() in 1.5]
|
|
---
|
|
src/proto_http.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/proto_http.c b/src/proto_http.c
|
|
index 5db64b5..02dc42b 100644
|
|
--- a/src/proto_http.c
|
|
+++ b/src/proto_http.c
|
|
@@ -11249,6 +11249,8 @@ static int sample_conv_http_date(const struct arg *args, struct sample *smp)
|
|
curr_date += args[0].data.sint;
|
|
|
|
tm = gmtime(&curr_date);
|
|
+ if (!tm)
|
|
+ return 0;
|
|
|
|
temp = get_trash_chunk();
|
|
temp->len = snprintf(temp->str, temp->size - temp->len,
|
|
--
|
|
2.1.4
|
|
|