Commit 82ef1467 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1805195, r1812004 from trunk: 

Update offsets

Entry for 2.4.28 regression (r1808855 missing r1805195).

Submitted by: jim, ylavic
Reviewed/backported by: ylavic (RTC 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
parent 1cafb747

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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>]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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 ]

modules/proxy/mod_proxy.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }