ad328cbcf4
expose more worker status info in prep for making
...
more dynamically changable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728142 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 14:56:30 +00:00
67ddd9009c
* Introduce ap_proxy_buckets_lifetime_transform as a replacement for
...
proxy_buckets_lifetime_transform in mod_proxy_http. Another future consumer
of this will be mod_proxy_wstunnel.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726779 13f79535-47bb-0310-9956-ffa450edef68
2016-01-26 12:13:56 +00:00
929bed749f
Adjust so that watchdog runs every 2 seconds
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725976 13f79535-47bb-0310-9956-ffa450edef68
2016-01-21 15:08:25 +00:00
a107563a23
And make the list of health check conditions viewable via
...
the balancer manager :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725609 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 20:48:33 +00:00
1049c6d727
Start impl of expr conditions for runtime checks
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725545 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 15:29:25 +00:00
89674b5612
For OPTIONS and HEAD, only 2xx and 3xx are considered "passing"
...
(until I implement the conditions expr testing)... honor
the pass/fail count and LOG_INFO when the health check enables
or disables a backend worker.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725523 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 14:14:27 +00:00
26019784af
Expose this in our API
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725306 13f79535-47bb-0310-9956-ffa450edef68
2016-01-18 16:54:06 +00:00
2fda66ec46
Make balancer manager health-check aware
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725120 13f79535-47bb-0310-9956-ffa450edef68
2016-01-17 20:12:09 +00:00
9f2dd3550e
1st cut of 'simple' tcp check... We reuse various proxy
...
function and so this *could* be more streamlined, but
use this to show how the other would work, since we need
brigades, SSL/TLS support, etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1724879 13f79535-47bb-0310-9956-ffa450edef68
2016-01-15 21:37:23 +00:00
d1c307f15a
per rplum suggestion. thx!
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1724017 13f79535-47bb-0310-9956-ffa450edef68
2016-01-11 13:06:03 +00:00
b66e366bdc
Use enums and structs to keep things better organized
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1723953 13f79535-47bb-0310-9956-ffa450edef68
2016-01-10 19:20:31 +00:00
0bfe3c0cd8
move to per server conf, useful for adding HealthCheckCondition
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722328 13f79535-47bb-0310-9956-ffa450edef68
2015-12-30 13:28:12 +00:00
4d3ab92dbf
Make aware of new status: Failed Health Check.
...
Store the number of current passes/fails in shm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722195 13f79535-47bb-0310-9956-ffa450edef68
2015-12-29 17:42:19 +00:00
33aceece57
Commit framework impl of health-check module plus
...
required changes. The actual health checking is
currently in progress, but wanted to add in at
this stage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722177 13f79535-47bb-0310-9956-ffa450edef68
2015-12-29 16:12:04 +00:00
2b7a352917
Abstract out as macro
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1721759 13f79535-47bb-0310-9956-ffa450edef68
2015-12-26 21:29:21 +00:00
fd61b03b75
* mod_proxy: Allow setting options to globally defined balancer from
...
ProxyPass used in VirtualHost. Balancers are now merged using the new
merge_balancers method which merges the balancers options.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667707 13f79535-47bb-0310-9956-ffa450edef68
2015-03-19 11:29:55 +00:00
23c292e6cd
Change the return value to const, so the const non-matching input can just be
...
returned.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1647334 13f79535-47bb-0310-9956-ffa450edef68
2014-12-22 15:39:54 +00:00
85d1a0ba01
Allow SetHandler+UDS+fcgi to take advantage of dedicated workers including
...
opting in to connection reuse and other proxy options (max=, etc).
adds 'enablereuse' proxyoption and a minor MMN bump to share
proxy_desocketfy outside of mod_proxy.c, which is required to
match workers to URLs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1647009 13f79535-47bb-0310-9956-ffa450edef68
2014-12-20 15:56:16 +00:00
074c9cce56
Might as well make it 256 and be done w/ it. The extra bytes are
...
moot nowaways.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621382 13f79535-47bb-0310-9956-ffa450edef68
2014-08-29 20:39:22 +00:00
6be32ac353
PR53218
...
Allow for longer worker names and make truncation a non-fatal
error...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621367 13f79535-47bb-0310-9956-ffa450edef68
2014-08-29 19:17:45 +00:00
c0a52f109d
mod_proxy: add ap_proxy_define_match_worker() and use it for ProxyPassMatch
...
and ProxyMatch section to distinguish between normal workers and workers
with regex substitutions in the name. Implement handling of such workers
in ap_proxy_get_worker(). PR 43513
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609680 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 10:36:15 +00:00
ec95d72c5a
mod_proxy: Don't limit the size of the connectable Unix Domain Socket paths.
...
Since connect() to UDS path is used at several places, introduce
ap_proxy_connect_uds() in proxy_util.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602989 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 20:26:24 +00:00
a306773aa4
Clarify an existing requirement of the server_portstr parameter
...
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.
(And don't bother with using strcpy in order to zap a string.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1592514 13f79535-47bb-0310-9956-ffa450edef68
2014-05-05 12:47:18 +00:00
5512fa1b86
mod_proxy_http: Add detach_backend hook.
...
The immediate use is for a SSL-related module which works
on the backend proxy connection to be able to "leak" information
into the client r for logging.
This could be useful with other proxy scheme handlers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1586719 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 17:07:18 +00:00
fb3ff3e754
Redo what was reverted in r1572627.
...
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572630 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 15:40:01 +00:00
0ab0ee5043
Move newly added proxy_conn_rec's uds_path field to the end of the struct like in 2.4.x.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572628 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 15:33:58 +00:00
dc560db2e9
Revert r1572606 for the time being since backport would conflict with 2.4.x's proxy_conn_rec.
...
The uds_path field is at the end of the struct in 2.4.x but not in trunk.
Fix that first, then recommit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572627 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 15:31:58 +00:00
93a607e6f2
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
...
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572606 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 14:52:12 +00:00
72df6b36bf
make mod_rewrite and mod_proxy UDS work together...
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560367 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 14:54:21 +00:00
43e022f007
core: Support named groups and backreferences within the LocationMatch,
...
DirectoryMatch, FilesMatch and ProxyMatch directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554300 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 19:50:52 +00:00
bb76893cfb
We were not being consistent between http and others
...
if we added the default port or not during the canonizing
phase... Baseline the http method (don't add unless the
port provided isn't the default).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542562 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 20:13:48 +00:00
61a09af7dc
Expand some of these fields... mostlt it's the workers that we
...
need to expand due to them mapping to actual hostnames
NOTE: 96 enough?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540318 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 14:49:25 +00:00
347c75b3c5
Put the uds path in its own field, and adjust the logic
...
to look for an empty string rather than a flag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533087 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 14:10:43 +00:00
c984a2e5f3
Ensure that userland format of UDS is the same as how it is
...
configured, no matter how we store and use it internally.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531962 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 16:12:30 +00:00
e40e0a785b
Reformat the UDS support inline with a new naming structure.
...
Use a flag for speed for testing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531340 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 16:12:41 +00:00
d79b9a03c5
mod_proxy: Add ap_connection_reusable() for checking if a connection
...
is reusable as of this point in processing.
mod_proxy_fcgi uses the new API to determine if FCGI_CONN_CLOSE
should be enabled, but that doesn't change existing behavior
since the connection is currently marked for closure elsewhere
in the module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526189 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 14:29:02 +00:00
357828f9d2
Allow for a simple socket check in addition to the
...
higher level protocol-level checks for backends...
Not sure if it makes sense to do both or not... Comments?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1516930 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 16:48:42 +00:00
c66c301b57
fix Doxygen warnings/comments
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1513458 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 12:28:31 +00:00
3919a404e3
update comments
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483178 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 03:13:29 +00:00
9bc9d79079
core: Stop the HTTP_IN filter from attempting to write error buckets
...
to the output filters, which is bogus in the proxy case. Create a
clean mapping from APR codes to HTTP status codes, and use it where
needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482522 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 18:58:06 +00:00
d2e6782ea7
mod_proxy, mod_proxy_http: Connection headers must be stripped on the way
...
in and out, support an optional function to handle this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482075 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:11:36 +00:00
d7c8ba3992
Mod_proxy used the global pool w/o mutex. fix.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480627 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 13:33:02 +00:00
d31632f33c
Add failontimeout to allow server admin to mark balancer member in err if IO timeout occurs.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1465839 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 00:18:42 +00:00
2bea7fb2bf
Pull out duplicated code to proxy_util...
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453875 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 14:06:51 +00:00
f5f921a2f2
Add in rough uds support (Bugx 54101) from Blaise Tarr <blaise.tarr@gmail.com>
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451633 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 16:21:49 +00:00
317eca4540
realign and fix logic
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1448630 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 13:19:30 +00:00
0d13f604c1
ProxyPassInherit directive
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439404 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 13:58:24 +00:00
74708ea8f3
Allow for searching w/i shm slots for a specific worker and balancer
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421953 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 16:14:06 +00:00
b63656829c
Use inherit_set to let the global server set
...
the default for all vhosts.
Otherwise inherit would need to be disabled
redundantly in each vhost.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421912 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 15:02:30 +00:00
bdafd4e926
Anticipate ordering for 2.4 backport
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421852 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 13:30:45 +00:00
