Date: Wed, 26 Feb 2020 10:53:47 -0800 From: Craig Leres <leres@freebsd.org> To: Mathieu Arnold <mat@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r526977 - in head/net-mgmt/nagios-plugins: . files Message-ID: <de8ddb65-c1b3-8797-e060-80f65a6c5ef2@freebsd.org> In-Reply-To: <202002241538.01OFcHl9093218@repo.freebsd.org> References: <202002241538.01OFcHl9093218@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------3424E24151128530CBCF5C22 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2020-02-24 07:38, Mathieu Arnold wrote: > Author: mat > Date: Mon Feb 24 15:38:17 2020 > New Revision: 526977 > URL:https://svnweb.freebsd.org/changeset/ports/526977 > > Log: > Update to 2.3.2. After upgrading I'm unable to get any of the -s, -r, or -R flags to work with check_http: # 2.3.1 works fun 235 % pkg info nagios-plugins | fgrep Version Version : 2.3.1,1 fun 236 % /usr/local/libexec/nagios/check_http -S -H www.freebsd.org -s operating HTTP OK: HTTP/1.1 200 OK - 26414 bytes in 0.393 second response time |time=0.393414s;;;0.000000 size=26414B;;;0 # 2.3.2 fails dot 241 % pkg info nagios-plugins | fgrep Version Version : 2.3.2,1 dot 242 % /usr/local/libexec/nagios/check_http -S -H www.freebsd.org -s operating HTTP CRITICAL: HTTP/1.1 200 OK - string 'operating' not found on 'https://www.freebsd.org:443/' - 8195 bytes in 0.351 second response time |time=0.350931s;;;0.000000 size=8195B;;;0 My guess was an upstream bug possibly related to this change: * plugins/check_http.c: Resolve #507 - stop reading when Content-Length matches the amount of content received Prior to this commit, check_http relied on read() returning 0 or erroring in order to exit the loop. This commit keeps the same behavior, but once headers have been received, it also reads the Content-Length and compares it to the number of bytes received after the start of the body. While the change sounds reasonable when I add -v to check_http the www.freebsd.org example gets 583 lines of content/body with 2.3.1 but only 177 with 2.3.2. Reverting the changes to document_headers_done() between 2.3.1 and 2.3.2 unbreaks this. I've attached a patch that does this. Looks like only paying customers can file bug reports but I posted something to the plugin dev forum: https://support.nagios.com/forum/viewtopic.php?f=35&t=57665 Craig --------------3424E24151128530CBCF5C22 Content-Type: text/plain; charset=UTF-8; name="patch-plugins_check__http.c" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-plugins_check__http.c" LS0tIHBsdWdpbnMvY2hlY2tfaHR0cC5jLm9yaWcJMjAyMC0wMi0yMCAxOToxNDo1MiBVVEMK KysrIHBsdWdpbnMvY2hlY2tfaHR0cC5jCkBAIC02MDgsMTEgKzYwOCw5IEBAIGVuYWJsZV9z c2w6CiAKIAogCi0vKiBSZXR1cm5zIDAgaWYgd2UncmUgc3RpbGwgcmV0cmlldmluZyB0aGUg aGVhZGVycy4KLSAqIE90aGVyd2lzZSwgcmV0dXJucyB0aGUgbGVuZ3RoIG9mIHRoZSBoZWFk ZXIgKG5vdCBpbmNsdWRpbmcgdGhlIGZpbmFsIG5ld2xpbmVzKQotICovCisvKiBSZXR1cm5z IDEgaWYgd2UncmUgZG9uZSBwcm9jZXNzaW5nIHRoZSBkb2N1bWVudCBib2R5OyAwIHRvIGtl ZXAgZ29pbmcgKi8KIHN0YXRpYyBpbnQKLWRvY3VtZW50X2hlYWRlcnNfZG9uZSAoY29uc3Qg Y2hhciAqZnVsbF9wYWdlKQorZG9jdW1lbnRfaGVhZGVyc19kb25lIChjaGFyICpmdWxsX3Bh Z2UpCiB7CiAgICAgY29uc3QgY2hhciAqYm9keTsKIApAQCAtNjI0LDcgKzYyMiw4IEBAIGRv Y3VtZW50X2hlYWRlcnNfZG9uZSAoY29uc3QgY2hhciAqZnVsbF8KICAgICBpZiAoISpib2R5 KQogICAgICAgICByZXR1cm4gMDsgIC8qIGhhdmVuJ3QgcmVhZCBlbmQgb2YgaGVhZGVycyB5 ZXQgKi8KIAotICAgIHJldHVybiBib2R5IC0gZnVsbF9wYWdlOworICAgIGZ1bGxfcGFnZVti b2R5IC0gZnVsbF9wYWdlXSA9IDA7CisgICAgcmV0dXJuIDE7CiB9CiAKIHN0YXRpYyB0aW1l X3QKQEAgLTEwMTQsMTAgKzEwMTMsNiBAQCBjaGVja19odHRwICh2b2lkKQogICAgIGNoYXIg KnBhZ2U7CiAgICAgY2hhciAqYXV0aDsKICAgICBpbnQgaHR0cF9zdGF0dXM7Ci0gICAgaW50 IGhlYWRlcl9lbmQ7Ci0gICAgaW50IGNvbnRlbnRfbGVuZ3RoOwotICAgIGludCBjb250ZW50 X3N0YXJ0OwotICAgIGludCBzZWVuX2xlbmd0aDsKICAgICBpbnQgaSA9IDA7CiAgICAgc2l6 ZV90IHBhZ2VzaXplID0gMDsKICAgICBjaGFyICpmdWxsX3BhZ2U7CkBAIC0xMjAwLDQwICsx MTk1LDExIEBAIGNoZWNrX2h0dHAgKHZvaWQpCiAgICAgICAgIGZ1bGxfcGFnZSA9IGZ1bGxf cGFnZV9uZXc7CiAgICAgICAgIHBhZ2VzaXplICs9IGk7CiAKLSAgICAgICAgaGVhZGVyX2Vu ZCA9IGRvY3VtZW50X2hlYWRlcnNfZG9uZShmdWxsX3BhZ2UpOwotICAgICAgICBpZiAoaGVh ZGVyX2VuZCkgeworICAgICAgICBpZiAobm9fYm9keSAmJiBkb2N1bWVudF9oZWFkZXJzX2Rv bmUgKGZ1bGxfcGFnZSkpIHsKICAgICAgICAgICAgIGkgPSAwOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICB9Ci0KLSAgICBpZiAobm9fYm9keSkgewotICAgICAgICBm dWxsX3BhZ2VbaGVhZGVyX2VuZF0gPSAnXDAnOwotICAgIH0KLSAgICBlbHNlIHsKLSAgICAg ICAgY29udGVudF9sZW5ndGggPSBnZXRfY29udGVudF9sZW5ndGgoZnVsbF9wYWdlKTsKLQot ICAgICAgICBjb250ZW50X3N0YXJ0ID0gaGVhZGVyX2VuZCArIDE7Ci0gICAgICAgIHdoaWxl IChmdWxsX3BhZ2VbY29udGVudF9zdGFydF0gPT0gJ1xuJyB8fCBmdWxsX3BhZ2VbY29udGVu dF9zdGFydF0gPT0gJ1xyJykgewotICAgICAgICAgICAgY29udGVudF9zdGFydCArPSAxOwot ICAgICAgICB9Ci0gICAgICAgIHNlZW5fbGVuZ3RoID0gcGFnZXNpemUgLSBjb250ZW50X3N0 YXJ0OwotICAgICAgICAvKiBDb250aW51ZSByZWNlaXZpbmcgdGhlIGJvZHkgdW50aWwgY29u dGVudC1sZW5ndGggaXMgbWV0ICovCi0gICAgICAgIHdoaWxlIChzZWVuX2xlbmd0aCA8IGNv bnRlbnRfbGVuZ3RoCi0gICAgICAgICAgICAmJiAoaSA9IG15X3JlY3YoYnVmZmVyLCBNQVhf SU5QVVRfQlVGRkVSLTEpID4gMCkpIHsKLQotICAgICAgICAgICAgYnVmZmVyW2ldID0gJ1ww JzsKLQotICAgICAgICAgICAgaWYgKChmdWxsX3BhZ2VfbmV3ID0gcmVhbGxvYyhmdWxsX3Bh Z2UsIHBhZ2VzaXplICsgaSArIDEpKSA9PSBOVUxMKQotICAgICAgICAgICAgICAgIGRpZSAo U1RBVEVfVU5LTk9XTiwgXygiSFRUUCBVTktOT1dOIC0gQ291bGQgbm90IGFsbG9jYXRlIG1l bW9yeSBmb3IgZnVsbF9wYWdlXG4iKSk7Ci0gICAgICAgICAgICBtZW1tb3ZlKCZmdWxsX3Bh Z2VfbmV3W3BhZ2VzaXplXSwgYnVmZmVyLCBpKTsKLSAgICAgICAgICAgIGZ1bGxfcGFnZSA9 IGZ1bGxfcGFnZV9uZXc7Ci0KLSAgICAgICAgICAgIHBhZ2VzaXplICs9IGk7Ci0gICAgICAg ICAgICBzZWVuX2xlbmd0aCA9IHBhZ2VzaXplIC0gY29udGVudF9zdGFydDsKLSAgICAgICAg fQotICAgIH0KLQogICAgIG1pY3Jvc2VjX3RyYW5zZmVyID0gZGVsdGltZSAodHZfdGVtcCk7 CiAgICAgZWxhcHNlZF90aW1lX3RyYW5zZmVyID0gKGRvdWJsZSltaWNyb3NlY190cmFuc2Zl ciAvIDEuMGU2OwogCg== --------------3424E24151128530CBCF5C22--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?de8ddb65-c1b3-8797-e060-80f65a6c5ef2>