]> git.ipfire.org Git - thirdparty/haproxy.git/commit
projects / thirdparty / haproxy.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eccb31c) | patch
BUG/MINOR: tools: fix parsing "us" unit for timers
authorThayne McCombs <thayne@lucidchart.com>
Fri, 2 Apr 2021 20:12:43 +0000 (14:12 -0600)
committerChristopher Faulet <cfaulet@haproxy.com>
Tue, 6 Apr 2021 05:31:51 +0000 (07:31 +0200)
commita68380524b5b47cd77f5f4a47c1441b3c5b2cf93
tree5dad1b90b1de5a9e2413d016ec59433456cc869dtree
parenteccb31c939cea18ca844b831602f0008c318d98ecommit | diff
BUG/MINOR: tools: fix parsing "us" unit for timers

Commit c20ad0d8dbd1bb5707bbfe23632415c3062e046c (BUG/MINOR: tools:  make
parse_time_err() more strict on the timer validity) broke parsing the "us"
unit in timers. It caused `parse_time_err()` to return the string "s",
which indicates an error.

Now if the "u" is followed by an "s" we properly continue processing the
time instead of immediately failing.

This fixes #1209. It must be backported to all stable versions.
src/tools.c diff | blob | blame | history
Mirror of https://github.com/haproxy/haproxy.git