Commit Graph

53 Commits

Author SHA1 Message Date
1a216eca67 More trunk backporting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@809545 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 11:41:33 +00:00
fdbbba3802 Unused
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@774773 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 14:13:06 +00:00
94a600cfbf minor clean
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@774429 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 16:56:50 +00:00
8add30621f Sync up with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@774427 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 16:55:06 +00:00
666508d21d Move away from sub-modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772334 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 16:00:22 +00:00
3788e4cf66 Oh joy. Fold in backportable proxy changes/improvements
from trunk as of r772279



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772280 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 14:33:45 +00:00
6922d12efb Approvd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@739860 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 21:59:35 +00:00
f061a45fce Merge r451572 from trunk:
Add force recovery for balancer.
In case all balancer members were in error state 503
was returned until the recovery timeout expired.
The patch forces recovery in case all balancer members
are in error state regardless of recovery timeout
directive.
This fixes the time gap when 503 was returned and
backend was already up and running.

Submitted by: mturk
Reviewed by: jim, rpluem, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@714270 13f79535-47bb-0310-9956-ffa450edef68
2008-11-15 14:16:23 +00:00
8d21680532 Merge r686805, r687099 from trunk:
Add in bybusyness LB method, via Joel Gluth in
   https://issues.apache.org/bugzilla/show_bug.cgi?id=45501

NOTE: Name changed and added in to ease enhancement/bugfixes


Add in additional logging and use correct formats

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696752 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 18:30:27 +00:00
de3d2ba1cf * mod_proxy_balancer: Allow for treatment of ';' char as a session
deliminator/separator, ala mod_jk.
       PR: 45158
           Trunk version of patch:
                  http://svn.apache.org/viewvc?rev=686809&view=rev
                         http://svn.apache.org/viewvc?rev=687754&view=rev
                             Backport version for 2.2.x of patch:
                                    http://people.apache.org/~jim/patches/scolon-proxy.patch.txt
                                        +1: jim, rpluem, jerenkrantz




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696319 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 14:29:14 +00:00
99acf5e2ce Merge r683373 from trunk:
* Move nonce field inside the html form.

PR: 45578

Submitted by: rpluem
Reviewed by: rpluem, covener, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@683686 13f79535-47bb-0310-9956-ffa450edef68
2008-08-07 19:30:02 +00:00
d6ba13d24c Backport r663967
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@665755 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 16:41:08 +00:00
48ead8029e Merge r649169, r649239, r649840, r649922, r650026, r661452, r661459 from trunk:
Make mod_proxy_ajp aware of the nocanon envvar


handle ? in cases where nocanon is in effect


* Do not add the query string again in the case that we are using the
  unparsed uri.

PR: 44803


Set at init time, and combine comments


Typo.


* Do not add the query string again in the case that we are using the
  unparsed uri.

PR: 44803


* Set at init time and combine comments.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663593 13f79535-47bb-0310-9956-ffa450edef68
2008-06-05 12:46:43 +00:00
b74f25bcee Merge r661666 from trunk:
Prevent CSRF attacks against the balancer-manager (CVE-2007-6420)

* modules/proxy/mod_proxy_balancer.c (balancer_init): New function.
  (balancer_handler): Place a nonce in the form output, and check that
  the submitted form data includes that nonce.
  (ap_proxy_balancer_register_hook): Register the new post_config hook.

Submitted by: jorton
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663514 13f79535-47bb-0310-9956-ffa450edef68
2008-06-05 10:01:30 +00:00
c9b1d06d54 http://svn.apache.org/viewvc?rev=606693&view=rev
http://svn.apache.org/viewvc?rev=607276&view=rev



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608192 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 19:26:59 +00:00
12ee64e08b Merge r607275, r607403 from trunk:
* Correctly escape the worker route and the worker redirect string in the HTML
  output of the balancer manager.

Reported by SecurityReason.

Submitted by: rpluem
Reviewed by: rpluem, niq, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608061 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 09:49:04 +00:00
84cb0035c2 * Backport CVE-2007-6422 fix (r607273, r607402).
* Update proposal for PR 38034 fix (mod_dav negotiation bug)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607850 13f79535-47bb-0310-9956-ffa450edef68
2008-01-01 14:12:33 +00:00
d9e23cea87 * Merge r551099 from trunk:
mod_proxy_balancer: Remove the broken attempt to change balancer
  params on-the-fly via the admin manager.

Submitted by: jfclere
Reviewed by: jim, rpluem, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601272 13f79535-47bb-0310-9956-ffa450edef68
2007-12-05 09:37:23 +00:00
1456a9f3db Merge r572937, r574485, r574486 from trunk:
Be proactively safe. A cheap check, but helps prevents badness :)


* Do not reset lbstatus, lbfactor and lbset if the shared proxy_worker_stat
  structure for a worker is already initialized by the same or another
  process.


* This check is now part of the PROXY_WORKER_IS_INITIALIZED macro.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@575708 13f79535-47bb-0310-9956-ffa450edef68
2007-09-14 14:47:54 +00:00
33f9f9f3ff backport of:
http://svn.apache.org/viewvc?view=rev&rev=550519
http://svn.apache.org/viewvc?view=rev&rev=551099
http://svn.apache.org/viewvc?view=rev&rev=551126
http://svn.apache.org/viewvc?view=rev&rev=551935
http://svn.apache.org/viewvc?view=rev&rev=554892
Allow to use different values for sessionid in url encoded id
and cookies. (PR 41897)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@557993 13f79535-47bb-0310-9956-ffa450edef68
2007-07-20 13:20:30 +00:00
f080deb943 Backport accepted patch from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@557926 13f79535-47bb-0310-9956-ffa450edef68
2007-07-20 08:37:59 +00:00
e57edcafb7 Merge r484789 from trunk:
We are doing nothing here... but keep the stubs
in case we ever do.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@527107 13f79535-47bb-0310-9956-ffa450edef68
2007-04-10 12:38:08 +00:00
7abbccf5b5 Merge r484978,r484787,r484792 from trunk:
* Isolate the unlock return vals

* Log when the lock fails.

* Failure to unlock is very nasty, so log it to help with troubleshooting.

Submitted by: jim
Reviewed by: jim, rpluem, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488822 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 21:56:16 +00:00
205debdd20 Merge r484783 from trunk:
No need for each ind lb method to increment the elected
element. Do so from the main calling func.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486659 13f79535-47bb-0310-9956-ffa450edef68
2006-12-13 14:06:43 +00:00
8a0c72496b Merge r417238, r437773, r446929, r453630 from trunk:
* Add the following environment variables to expose the information
* about
  the route, the sticky session and the worker used during a request to
  other modules:

  BALANCER_SESSION_STICKY
  BALANCER_SESSION_ROUTE
  BALANCER_NAME
  BALANCER_WORKER_NAME
  BALANCER_WORKER_ROUTE

PR: 39806
Submitted by: Brian <brectanu gmail.com>
Reviewed by: rpluem


fix validation error


* Set the new environment variable BALANCER_ROUTE_CHANGED if a worker with a
  route different from the one supplied by the client had been chosen or if
  the client supplied no routing information for a balancer with sticky
  sessions.


* mod_proxy_balancer: Document BALANCER_ROUTE_CHANGED environment variable.

Submitted by: Brian Rectanus <brectanu gmail.com>
Reviewed by: rpluem

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@472114 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 13:49:09 +00:00
50d9361c08 Merge r440160 from trunk:
* Extract stickysession information correctly in the case that it is given
  as parameter like in the following example:

  www.someplace.com/somewhere/?jsessionid=gggfgdufdfoef.server&parameter=value

  So far we were only able to handle stickysession information encoded in the
  following form:

  www.someplace.com/somewhere/;jsessionid=gggfgdufdfoef.server?parameter=value

PR: 40400

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@472100 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 13:29:57 +00:00
492e695c40 merge from trunk (but preserve ap_get_server_version()):
*) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now 
     deprecated, and is replaced by ap_get_server_banner() and 
     ap_get_server_description().

Reviewed by: rpluem, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
2006-09-15 13:19:25 +00:00
5bc3406884 Merge r427172 from trunk:
Add in a very simple balancer "set" concept, which allows
for members to be assigned to a particular cluster set
such that members in lower-numbered sets are checked/used
before those in higher ones.

Also bundled in this are some HTML cleanups for the balancer
manager UI. Sorry for the mixins :)

Compiles/builds clean: passes test framework as well
as more normal usage tests ;)

Reviewed by: jim
Merge r427368, r428352, r428361, r432352 from trunk:

Reset standby flags for each loop through the cluster sets


Initialization change. Move to a different format
to force resets as well as a common technique, in case
_route is updated at some point.


Update docs for proxy:

  1. Put params in abc order
  2. Add hot-standby example
  3. Add in new features that hadn't been documented yet (lbset, ...)

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440800 13f79535-47bb-0310-9956-ffa450edef68
2006-09-06 17:35:51 +00:00
e1d87405df Merge r421287 from trunk:
The number of times elected as well as the i/o
of the workers is useful info to show in the
manager.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438564 13f79535-47bb-0310-9956-ffa450edef68
2006-08-30 17:51:43 +00:00
920d31a23d Merge r420936, r420954, r420986, r421283 from trunk:
Restructure the find_route_worker() function. Basically,
it should take care of knowing about usable and unusable
workers. By centralizing this logic, it will make it
easier and more streamlined to add in the forthcoming
hot-standby status workers.

Clean up some proxy macros. Avoid the use of magic
numbers, and instead use pre-defined defines. Also,
ensure that usable workers have been initialized :)

Allocate a bit for hot standbys. Adjust so that
normal "usable" workers don't count these.

Add in hot-standby balancer member. If all other members
are disabled or not-usable, ONLY THEN will the hot
standby's be used.


Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438563 13f79535-47bb-0310-9956-ffa450edef68
2006-08-30 17:50:47 +00:00
0de2fbe0e0 Merge r417443 from trunk:
* Retry worker chosen by client supplied route / redirect worker if it
  is in error state before sending "Service Temporarily Unavailable".

PR: 38962
Submitted by: Christian Boitel <cboitel lfdj.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437745 13f79535-47bb-0310-9956-ffa450edef68
2006-08-28 16:32:09 +00:00
ae1748a99f update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 03:38:44 +00:00
786089eef9 Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 01:53:06 +00:00
f1e91d7d0e Merge r394065 and r394446 from trunk.
PR: 38227, 38267
Reviewed By:  rpluem, jim, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396050 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 01:35:50 +00:00
8ffd8c554b Update the last year of copyright for the 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:33:16 +00:00
ca300bfa31 Merge r374929 from trunk:
* Do not overwrite the status of initialized workers and respect the configured
  status of uninitilized workers when creating a new child process.

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390182 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 17:30:32 +00:00
143f2c5b3f Trival backports having 3 * +1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@356764 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 10:05:48 +00:00
b3181bddae No functional change: remove trailing whitespace. This also means
that "blank" lines, which had consisted of just spaces
and/or tabs are now truly blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:20:05 +00:00
678128cee1 Merge r312963 from trunk:
mod_proxy_balancer: BalancerManager and proxies correctly handle
member workers with paths. PR36816. [Ruediger Pluem, Jim Jagielski]

Reviewed by: jim, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312964 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 21:43:32 +00:00
97894239da Merge r307389 from trunk:
* Fix a declaration problem introduced in r195013 that is C99 but not ANSI C
  compatible. Thus move declaration of *worker to the top of find_session_route
  to make it ANSI C compatible again.

Submitted by: NormW <normw bocnet.com.au>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307393 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 11:02:20 +00:00
645d516f6a Merge r295013 from trunk:
* Fix PR36507 (mod_proxy_balancer does not handle sticky sessions with
  tomcat correctly).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306884 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 20:59:48 +00:00
69c7b5f5e4 Backport of the following patches from trunk:
r279973
  r279752
  r279579
  r279319
  r279305

------------------------------------------------------------------------
r279973 | jorton | 2005-09-10 05:10:27 -0400 (Sat, 10 Sep 2005) | 5 lines

* modules/proxy/mod_proxy_balancer.c (balancer_handler): Fix gcc
warning; no functional change.

* modules/proxy/mod_proxy.c (set_balancer_param): Likewise.

------------------------------------------------------------------------
r279752 | jim | 2005-09-09 08:28:02 -0400 (Fri, 09 Sep 2005) | 4 lines

Proxy balancer lbmethods are now registered as providers and not
via hooks. Move various find() functions back to mod_proxy_balancer
where they belong :)

------------------------------------------------------------------------
r279579 | bnicholes | 2005-09-08 12:37:00 -0400 (Thu, 08 Sep 2005) | 1 line

Remove proxy_hook_load_lbmethods from Netware export list

------------------------------------------------------------------------
r279319 | jim | 2005-09-07 09:14:16 -0400 (Wed, 07 Sep 2005) | 2 lines

Minor nit. Methods are server-wide, so simply use the base version table.

------------------------------------------------------------------------
r279305 | jim | 2005-09-07 08:04:15 -0400 (Wed, 07 Sep 2005) | 4 lines

Restruct of lbmethod find-best algo's, bypassing hook mechanism.
Looking into provider method, but until then... Prevent core dump
when balancer not in vhosts



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290141 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 12:52:19 +00:00
a75750ab89 Arghhh.... missed the version. Sorry for the noise.
Revert the hack for setting the lbmethod.
The problem is deeper inside caused by the
new hook to the balancer module that is never
called on WIN32.
Although the hack fixed core dump, the proxy is
still unusable because the configuration is failing
due to the empty lbmethod names array.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233516 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 17:23:00 +00:00
f2b99c52c0 Revert the hack for setting the lbmethod.
The problem is deeper inside caused by the
new hook to the balancer module that is never
called on WIN32.
Although the hack fixed core dump, the proxy is
still unusable because the configuration is failing
due to the empty lbmethod names array.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233514 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 17:19:54 +00:00
3b8fe8c738 Temporary make balancer working.
What is needed is a setup for the finder function
introduced, but never implemented.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233468 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 11:58:36 +00:00
487504d63b When using the LB Balancer manager, if you disabled
a member, then clicked on another member and/or
itself again, the member would be re-enabled. This
was due to the form being "submitted" and
'dw' being null (observed with Safari). Anyway,
moving to a radio makes it explicit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232314 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 15:31:03 +00:00
a7d488a6d2 simple, functional interface to add additional balancer lb selection methods
without requiring code changes to mod_proxy/mod_proxy_balancer;
these can be implemented via sub-modules now.

Let the games begin...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232282 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 12:47:04 +00:00
3169261900 * modules/proxy/mod_proxy_balancer.c (proxy_balancer_pre_request): Fix
another valid variable-may-be-used-uninitialized warning from GCC 4
(in the !balancer->sticky case, find_session_route returns NULL
without setting route).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@193117 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 09:10:09 +00:00
e32503984e Set default number of maxattempts to the number of
balancer members.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160847 13f79535-47bb-0310-9956-ffa450edef68
2005-04-11 08:42:33 +00:00
c4323f9615 Simplify canon_handler. Blancer can have only a single
scheme.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160692 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:32:32 +00:00