Checkout Tools
  • last updated 3 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1836381, r1836382, r1836383, r1836386, r1836603 from trunk:

* mod_proxy: Remove load order and link dependency between mod_lbmethod_*

modules and mod_proxy by providing mod_proxy's ap_proxy_balancer_get_best_worker

as an optional function.

PR: 62557

* Remove invalid copy and paste comments

* Always retrieve conditional function. static variable might contain garbage if module was reloaded in a static build.

* Add missing log numbers

* ap_proxy_balancer_get_best_worker cannot be exported and used as an optional

function at the same time. So rename ap_proxy_balancer_get_best_worker to

proxy_balancer_get_best_worker and make it static which is then used as an

optional function and recreate ap_proxy_balancer_get_best_worker as an

exported thin wrapper of proxy_balancer_get_best_worker.

Submitted by: rpluem

Reviewed by: covener, jim, ylavic

  1. … 11 more files in changeset.
Merge r1828890, r1832500 from trunk:

mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are

used as drop-in replacements for unusable workers in the same load balancer set. This differs

from hot standbys which are only used when all workers in a set are unusable. PR 61140.

mod_proxy_balancer: follow up to r1828890: indentation and 80 col.

Submitted by: jhriggs, ylavic

Reviewed by: jhriggs, jim, ylavic

  1. … 11 more files in changeset.
Merge r1802845 from trunk:

Make sure updatelbstatus() is NULL

Submitted by: jim

Reviewed by: jim, covener, ylavic

  1. … 5 more files in changeset.
Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),

r1643672, r1496178 from trunk

* Synch with trunk:

- Add missing APLOGNO.

- mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.

- Move two variable assignments off the fast path.

- Fix curly braces style. Remove useless empty lines

- tab vs space

- Removed tabs.

- dump fcgi headers with trace8 instead of debug+compile-time flag.

- Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

Submitted by: jailletc36, ylavic, minfrin, fuankg, covener

Reviewed by: jailletc36, minfrin, ylavic

Backported by: jailletc36

  1. … 12 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.

mod_proxy: Make ap_proxy_retry_worker() into an optional function. Allows

mod_lbmethod_bybusyness, mod_lbmethod_byrequests, mod_lbmethod_bytraffic

and mod_lbmethod_heartbeat to be loaded without mod_proxy yet being present,

which happens when modules are loaded in alphabetical order.

  1. … 9 more files in changeset.
Merge r1206286 from trunk:

Move useful and shared balancer stuff to the shm slot...

Provide hooks for post-config/runtime addition of


Reviewed/backported by: jim

  1. … 6 more files in changeset.