--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: bookworm-pu: package monitoring-plugins/2.3.3-5+deb12u2
- From: Jan Wagner <waja@cyconet.org>
- Date: Wed, 31 Jan 2024 09:50:46 +0100
- Message-id: <5e2553f8-40f8-0e9e-4078-9e2329503e35@cyconet.org>
- Reply-to: Jan Wagner <waja@cyconet.org>
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: monitoring-plugins@packages.debian.org
Control: affects -1 + src:monitoring-plugins
[ Reason ]
As reported in #1061956, check_http fails when called with --no-body and
Transfer-Encoding: chunked is used
[ Impact ]
check_http is unusable when called with --no-body and Transfer-Encoding:
chunked is used
[ Tests ]
Upstream test suite, It was verified to work in the upstream issue
tracker
(https://github.com/monitoring-plugins/monitoring-plugins/pull/1901) and
2.3.5-1 has also this fix, which is since some time in testing.
[ Risks ]
Low, trivial change.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
The patch is required to fix the check_http regression.
[ Other info ]
This is a request for pre approval, if you are okay with the changes,
I'll upload it.
Kind Regards,
Jan
--
Never write mail to <waja@spamfalle.info>, you have been warned!
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GIT d-- s+: a C+++ UL++++ P+ L+++ E--- W+++ N+++ o++ K++ w--- O M+ V- PS
PE Y++
PGP++ t-- 5 X R tv- b+ DI D+ G++ e++ h---- r+++ y++++
------END GEEK CODE BLOCK------
diff --git a/debian/changelog b/debian/changelog
index d0b7b5b..1e067a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monitoring-plugins (2.3.3-5+deb12u2) bookworm; urgency=medium
+
+ * [c45bc15] Adding d/p/23_check_http_fix_unchunking_body from upstream
+ (Closes: #1061956)
+
+ -- Jan Wagner <waja@cyconet.org> Wed, 31 Jan 2024 09:40:18 +0100
+
monitoring-plugins (2.3.3-5+deb12u1) bookworm; urgency=medium
* [85eed74] Adding d/p/22_check_disk_avoid_mount from upstream
diff --git a/debian/patches/23_check_http_fix_unchunking_body b/debian/patches/23_check_http_fix_unchunking_body
new file mode 100644
index 0000000..b14cccc
--- /dev/null
+++ b/debian/patches/23_check_http_fix_unchunking_body
@@ -0,0 +1,22 @@
+From a6802bd5f50a5c12ed5bafa4fe9ee14fede7c1e1 Mon Sep 17 00:00:00 2001
+From: Thoralf Rickert-Wendt <30341294+trickert76@users.noreply.github.com>
+Date: Tue, 8 Aug 2023 10:22:53 +0200
+Subject: [PATCH] Fix issue #1872
+
+---
+ plugins/check_http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 1288c415d..718c8ee71 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -1279,7 +1279,7 @@ check_http (void)
+
+ regmatch_t chre_pmatch[1]; // We actually do not care about this, since we only want to know IF it was found
+
+- if (regexec(&chunked_header_regex, header, 1, chre_pmatch, 0) == 0) {
++ if (!no_body && regexec(&chunked_header_regex, header, 1, chre_pmatch, 0) == 0) {
+ if (verbose) {
+ printf("Found chunked content\n");
+ }
diff --git a/debian/patches/series b/debian/patches/series
index b024b25..d8711a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
15_check_swap_remove_includes
16_check_snmp_disable_multiplier_when_unused
22_check_disk_avoid_mount
+23_check_http_fix_unchunking_body
--- End Message ---