From adf3156959b80d5135fa4a98b649a400cbc9aafc Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 13 Oct 2017 07:30:15 +0000 Subject: [PATCH] Merge r1805195, r1812004 from trunk: Update offsets Entry for 2.4.28 regression (r1808855 missing r1805195). Submitted by: jim, ylavic Reviewed/backported by: ylavic (CTR per miss in the original merge) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1812074 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 6 ------ modules/proxy/mod_proxy.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 3f14645bd3..98bb1e73b3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.29 + *) mod_proxy: Fix regression for non decimal loadfactor parameter introduced + in 2.4.28. [Jim Jagielski] + *) mod_authz_dbd: fix a segmentation fault if AuthzDBDQuery is not set. PR 61546. [Lubos Uhliarik ] diff --git a/STATUS b/STATUS index d6eb45ddab..9bc8782169 100644 --- a/STATUS +++ b/STATUS @@ -220,12 +220,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: (merge with alterations for mmn etc.) +1: icing, ylavic - *) mod_proxy: Add missing commit from r1808855 (loadfactor now decimal) - trunk patch: http://svn.apache.org/r1805195 - trunk patch: http://svn.apache.org/r1812004 (CHANGES) - 2.4.x patch: svn merge -c 1805195,1812004 ^/httpd/httpd/trunk . - +1: ylavic, - PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 314fc0d782..d7f79cf062 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -105,7 +105,7 @@ static const char *set_worker_param(apr_pool_t *p, */ double fval = atof(val); ival = fval * 100.0; - if (ival < 1 || ival > 100) + if (ival < 100 || ival > 10000) return "LoadFactor must be a number between 1..100"; worker->s->lbfactor = ival; } -- 2.40.0