1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00

8 Commits

Author SHA1 Message Date
Yann Ylavic
6716ada174 mod_proxy: Fix canonicalisation and FCGI env (PATH_INFO, SCRIPT_NAME) for
"balancer:" URLs set via SetHandler, also allowing for "unix:"
           sockets with BalancerMember(s).  PR 69168.

* modules/proxy/proxy_util.h, modules/proxy/proxy_util.c:
  Move proxy_interpolate() from mod_proxy.c to ap_proxy_interpolate(),
  exported locally only (non public).
  Move proxy_fixup() from mod_proxy.c to ap_proxy_canon_url(), exported
  locally only too (non public).
  Rollback ap_proxy_fixup_uds_filename() to a local fixup_uds_filename()
  usable from proxy_util.c only. The public function will be removed in
  a following commit.

* modules/proxy/mod_proxy.h:
  Note that ap_proxy_fixup_uds_filename() is deprecated.

* modules/proxy/mod_proxy.c:
  Just use ap_proxy_canon_url() from proxy_fixup() and proxy_handler()
  for SetHandler URLs.

* modules/proxy/mod_proxy_balancer.c:
  Do not canonicalize the path from proxy_balancer_canon() anymore but
  rather from balancer_fixup() where the balancer URL is rewritten to
  the BalancerMember URL.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919022 13f79535-47bb-0310-9956-ffa450edef68
2024-07-08 13:59:50 +00:00
Yann Ylavic
cfee7ee407 mod_proxy: Follow up to r1912245: ap_proxy_ prefix for extern functions.
Even if they are not part of the API (not in mod_proxy.h) hence requires no
MMN bump, {get,set,increment_,decrement_}busy_count() being AP_PROXY_DECLARE()d
could name-collide with a third-party module's functions.

Rename them using the ap_proxy_ prefix, with an underscore after the verb for
for all of them too (for consistency), that is:
    ap_proxy_{get,set,increment,decrement}_busy_count()



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1913930 13f79535-47bb-0310-9956-ffa450edef68
2023-11-18 13:49:04 +00:00
Jean-Frederic Clere
1b9292a4c9 Arrange the bybusyness logic and prevent bad busy values
this closes #383


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1912245 13f79535-47bb-0310-9956-ffa450edef68
2023-09-11 13:50:21 +00:00
Rainer Jung
233afba4a7 Standardize order of "extern" and XXX_DECLARE_YYY.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728779 13f79535-47bb-0310-9956-ffa450edef68
2016-02-06 00:30:37 +00:00
Guenter Knauf
6f79dac483 Move *_DECLARE_* macros to beginning of line in headers.
Patch submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1374963 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 10:09:42 +00:00
Graham Leggett
3122ef26c6 mod_proxy: Move ap_proxy_strmatch_path and ap_proxy_strmatch_domain out of
the public API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209947 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 16:45:29 +00:00
Graham Leggett
5259bb3f02 mod_proxy: Make the ap_proxy_is* functions private.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209908 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 13:29:05 +00:00
Graham Leggett
0182b1654f 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209754 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:42:39 +00:00