Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1492699 is being indexed.

Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:

Rough start for simple, tunneling websocket proxy support.

Compiles at this stage and that's all I know :)

force correct scheme info

We need to ensure a conn_rec

Work around blocking issues...

And now pass the initial request to the backend...

I dislike this duplication of code from mod_proxy_http()

but maybe it's inevitable. I may create ap_proxy_create_headerb()

to create a header brigade that both modules can use.

Pull out duplicated code to proxy_util...

rename extension module... tunnel is more accurate

log nums

"final" rename :)

don't strip these, ensure that they exist.

streamline

bypass reqtimeout for websockets

Keep mod_req clear. Simply scan thru input filters and

remove it within the ws submodule. Nasty, but it keeps

mod_req untouched (for now ;) )

Reviewed/backported by: jim

  1. … 20 more files in changeset.
Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980, r1430575, r1439404 from trunk:

wtf are we doing merging in these from the parent??

These are server specific!

OK, enable/allow previous broken, bad behavior iff the user

really, really wants it. And warn that b-m isn't recommended

in those cases.

rjung's suggestions...

inherit inherit

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.

restrict inherit control to those fields that "require" it...

Redfine - we are just worried about balancers and workers, so have the directive clear about that.

Naming

ProxyPassInherit directive

Submitted by: jim, rjung, jim, jim, jim, jim

Reviewed/backported by: jim

  1. … 9 more files in changeset.
mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker

in error state if an IO timeout is detected.

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1465839

2.4.x patch: http://people.apache.org/~druggeri/patches/httpd-2.4.x-failontimeout.patch

Submitted by: druggeri

Reviewed by: jim, minfrin

  1. … 6 more files in changeset.
Merge r1387110, r1387444, r1387979, r1387607, r1387693, r1407085, r1421953 from trunk:

Persist local balancer-manager changes across restart/graceful.

Use identifying server_rec info when we know we have

unique and useful data :)

fix clang warning (dead initialization)

Log whether or not the restore from shm actually

resulted in a match of shm data, or whether it

was stale.

and this one as well... persist isn't inherited

better logging for re-use/use of shm

Allow for searching w/i shm slots for a specific worker and balancer

Reviewed/backported by: jim

  1. … 10 more files in changeset.
Merge r1404653 from trunk:

Allow for setting of sticky session split char...

Bugz 53893

Reviewed/backported by: jim

  1. … 10 more files in changeset.
  1. … 6 more files in changeset.
Merge r1306409:

* Add the forcerecovery balancer parameter that determines if recovery for

balancer workers without considering the retry value of workers is enforced.

There might be cases where an already overloaded backend can get into deeper

trouble if the recovery of all workers is enforced without considering the

retry parameter of each worker

Committed by: rpluem

Reviewed by: rpluem, covener, sf

  1. … 7 more files in changeset.
Merge r1242351 from trunk:

Handle cases, esp when using mod_proxy_fcgi, when we do not

want SCRIPT_FILENAME to include the query string.

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Cure size_t abuse; Backport r1227856
  1. … 3 more files in changeset.
Backport:

mod_proxy: Remove dead code from the public API, move single use code out

of the public API, remove redundant code from the public API.

mod_cache: Remove redundant code from the public API.

  1. … 9 more files in changeset.
Backport:

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 r1208897 from trunk:

Use 2 sep hashing functions to account for collisions...

Safe enough

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1208067, r1208068, r1208069 from trunk:

whitespace

Some optimization... we have a hash, use it. Quicker than all

these string comparisons.

Ensure casing doesn't matter... (we know balancer->s->name is

lc)

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1207926 from trunk:

Logic which makes the balancer "active" or not... so we can turn them

off and on as needed.

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1207863 from trunk:

Instead of running thru all kinds of logic paths, just add in

a on/off bit... No need for other balancer statuses(sp)?

Reviewed/backported by: jim

Merge r1207562 from trunk:

Pull this out as a sep function to allow for full vhosting

adjustment between get and define balancers...

Reviewed/backported by: jim

  1. … 1 more file in changeset.
Merge r1207467 from trunk:

"Final" (I hope) proxy struct/API changes in order to support

dynamic balancer allocation AND dynamic vhost-balancers

Reviewed/backported by: jim

  1. … 1 more file in changeset.
Merge r1207282 from trunk:

Error-check.

Reviewed/backported by: jim

  1. … 2 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

balancers.

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Merge r1206268 from trunk:

Allow compile time changes of field sizes and be more

"clear" regarding the diff between balancer and worker slots...

Reviewed/backported by: jim

  1. … 2 more files in changeset.