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

diff --git a/CHANGES b/CHANGES
index 3f14645bd3089acf89cb2f47387a1ed2401a97cb..98bb1e73b3d37f80475a94475f1caf836904d3cc 100644 (file)
--- 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 <luhliari redhat.com>]
 

diff --git a/STATUS b/STATUS
index d6eb45ddab753020a5020178bbfd1dea892cdd23..9bc8782169c71004d70a3077ce8434badc9d2377 100644 (file)
--- 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 314fc0d78231d5524d269c63ba2299c1913350b8..d7f79cf0620e112c6da8b3fc4e23e88e18cf5abe 100644 (file)
--- 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;
     }