www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
22,624 Commits 62 Branches 304 Tags
a03bcce31d66aac6556a5160b51f9c9643f61b29
Commit Graph

146 Commits

Author SHA1 Message Date
Jim Jagielski
9096c04779 Adjust for conf->workers being *proxy_worker and balancer->workers being **proxy_worker 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058624 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:59:02 +00:00
Jim Jagielski
201bbd1ba9 More movement to shared stuff... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058623 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:57 +00:00
Jim Jagielski
daa5a5c57c OK... a good commit point (we don't quite compile yet though...) 
Pull out the worker scoreboard cruft and start moving most
worker stuff to shm. Use slotmem for workers and provide
space for growth.

Redo logic:

  ap_proxy_define_*
  ap_proxy_create_*
  ap_proxy_initialize_*

Right now just for workers, but lay framework for balancers
as well. The idea is to break out the functional parts
to make it easy for dynamics. Defining is simply describing
the worker, and tucking that info away. When we create, we
go ahead and create the shared memory, etc... Initialize
is simply to allow child process to access the shm...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058622 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:50 +00:00
Jim Jagielski
5febbb22aa Use branch now 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058621 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:45 +00:00
Jim Jagielski
a280069b3c a pointer optim. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031798 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 21:17:05 +00:00
Graham Leggett
1ba4520701 Avoid unnecessariy initialisation before we test handler name. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024449 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-19 22:48:38 +00:00
Jeff Trawick
5a222cf2cf mod_proxy: Rename erroronstatus to failonstatus... 
... by popular demand, and add documentation.

Submitted by: Daniel Ruggeri <DRuggeri primary.net>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987359 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-20 00:54:34 +00:00
Jim Jagielski
c55a15fc2f Fold in some stuff to allow for matching of workers 
to their actual scoreboard slots, independent of slot
ID.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@984188 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-10 19:46:58 +00:00
Stefan Fritsch
7b3189cb8d remove more useless use of strlen 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982046 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-03 22:06:24 +00:00
Jeff Trawick
e6fcd04001 follow up to r930125 
change log message when forcing worker into error state:
* APLOG_ERR instead of unsuppressible APLOG_NOTICE
* follow formatting of existing proxy messages more closely


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@962972 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-11 02:54:30 +00:00
Stefan Fritsch
01b9f2e551 - Be less verbose at levels INFO and DEBUG in mod_proxy* and mod_ssl 
- Add some trace logging to core and http


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951900 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 17:07:12 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
Jim Jagielski
84f9080445 Move back to a post_config hook... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936880 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-22 14:52:43 +00:00
Jean-Frederic Clere
4c4b534813 Add updatelbstatus to allow to have all the LB logic in the balancers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936828 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-22 13:13:40 +00:00
Jim Jagielski
d9fcb8daf1 Add in BalancerNonce directive... useful for shared-secrets. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936407 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-21 18:19:06 +00:00
Jeff Trawick
6f4c170986 small style tweaks to r930125 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930254 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-02 12:19:22 +00:00
Nick Kew
9c1c3f56d4 Proxy balancer: support setting error status according to 
HTTP response code from a backend.
PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930125 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-01 22:48:38 +00:00
Rainer Jung
730a42e334 Fix crash in balancer-manager. 
This was due to an incomplete refactoring in
r771940 (switching balancer->workers to an
array of pointers).

It's likely that other balancer functionality
was broken too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@891230 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-16 13:24:51 +00:00
Jim Jagielski
85a6ee67c6 In the case where we have no members, they aren't in error 
states :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@795954 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-20 18:53:08 +00:00
Jim Jagielski
591bb63111 unused var 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774774 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-14 14:13:52 +00:00
Jim Jagielski
ceeb8b0403 standard method 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774428 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 16:56:12 +00:00
Jean-Frederic Clere
48ae3d9efa Allow the load balancing method to "create" workers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774400 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 15:27:05 +00:00
Jean-Frederic Clere
a970341df7 Arrange the proxy_balancer_method: 
- Put context back after the finder().
- Use  server_rec as second parameter for reset() and age().
- Add the call for reset().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773929 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-12 15:10:56 +00:00
Jim Jagielski
39c14c3bec update comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772279 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-06 14:32:46 +00:00
Jean-Frederic Clere
a29e9ec1d5 Change the order of mod_proxy and mod_proxy_balancer child_init(). 
Change the balancer workers area to the address of workers instead copying the workers.
Arrange lbmethod accordingly.
Move the creation of conf->forward worker to mod_proxy child_init().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771940 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 17:15:48 +00:00
Ruediger Pluem
a3c2a975c9 * Try first if we find any "recoverable" workers before we force them to 
recover.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@734710 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-15 13:59:11 +00:00
Jim Jagielski
653ac709cc All lbmethods are now ind submodules... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722952 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:08:26 +00:00
Jim Jagielski
45c5291a7f Allow determination of whether to use ';' as 
a sticky session path delim/sep (ala mod_jk) to
be runtime (and balancer-wise) configurable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687754 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-21 13:33:32 +00:00
Jim Jagielski
383a1d2cd1 Add in additional logging and use correct formats 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687099 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-19 17:28:00 +00:00
Jim Jagielski
5d8e4bba70 Remove trailing path element, ala ./jk/native/common/jk_lb_worker.c, 
but use apr_strtok niceness. PR: 45158


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@686809 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-18 16:10:41 +00:00
Jim Jagielski
1a0a3b549c 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@686805 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-18 15:59:48 +00:00
Ruediger Pluem
fef506ed1a * Move nonce field inside the html form. 
PR: 45578


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@683373 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-06 19:02:34 +00:00
Joe Orton
ce75fb285c No functional change; simplify the CVE-2007-6420 fix slightly, as 
suggested by rpluem:

* modules/proxy/mod_proxy_balancer.c (balancer_init): Serialize the
  UUID to a string here...
  (balancer_handler): ...rather than here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@663967 13f79535-47bb-0310-9956-ffa450edef68
 2008-06-06 14:44:35 +00:00
Joe Orton
4a375eff22 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@661666 13f79535-47bb-0310-9956-ffa450edef68
 2008-05-30 11:49:31 +00:00
Ruediger Pluem
6e450bc660 * Set at init time and combine comments. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@661459 13f79535-47bb-0310-9956-ffa450edef68
 2008-05-29 20:12:58 +00:00
Ruediger Pluem
c3242b9c5c * Do not add the query string again in the case that we are using the 
unparsed uri.

PR: 44803


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@661452 13f79535-47bb-0310-9956-ffa450edef68
 2008-05-29 19:53:30 +00:00
Paul Querna
a324a1d72f Remove all references to CORE_PRIVATE. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-07 10:45:43 +00:00
Ruediger Pluem
6062378f7c * Correctly escape the worker route and the worker redirect string in the HTML 
output of the balancer manager.

Reported by SecurityReason.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607275 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-28 15:57:36 +00:00
Ruediger Pluem
d80bc134c9 * Prevent crash in balancer manager if invalid balancer name is passed as 
parameter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607273 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-28 15:53:45 +00:00
Ruediger Pluem
b514669c7a * Set character set for HTML outputs generated by mod_ldap, 
mod_proxy_balancer, mod_proxy_ftp, mod_info, mod_dav without a character
  set to ISO-8859-1.

Submitted by: jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606693 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-24 11:45:22 +00:00
Ruediger Pluem
4df56cc5aa * Remove unneeded include of unistd.h. getpid is not used any longer since 
r394065.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599326 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-29 08:18:31 +00:00
Jim Jagielski
60bda3ec81 These really are block specific, so why not 
make them as such :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@575712 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-14 14:57:56 +00:00
Ruediger Pluem
5579888fa5 * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574485 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-11 06:38:16 +00:00
André Malo
42bb0116dd as not everyone needs sticky sessions - avoid segfault in balancer manager and 
mod_status


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@572832 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-04 23:09:24 +00:00
Mladen Turk
7306af0a70 Return 503 only if the route matches some of the balancer members and nofailover=On is specified. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556931 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-17 14:31:05 +00:00
Jean-Frederic Clere
e7a75e4f3e Fill notes "session-sticky" and subprocess_env "BALANCER_SESSION_STICKY" 
correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@554892 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-10 09:53:36 +00:00
Jean-Frederic Clere
3fe0224692 Don't display "PHPSESSIONID | PHPSESSIONID" but only 
"PHPSESSIONID".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551126 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-27 11:39:03 +00:00
Jean-Frederic Clere
9e567f96de Remove the balancer modification logic of balancer-manager 
because it can't work. And add the sticky_path to the
sticky display.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551099 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-27 08:42:02 +00:00
Jean-Frederic Clere
4dee811cb9 Add sticky_path to solve PR41897. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@550519 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-25 14:42:25 +00:00
Ruediger Pluem
94743e8f7b * Preset the form fields for route and redirect with the values of the active 
configuration in the scoreboard and not with the ones loaded from the
  configuration files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@544930 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-06 20:02:56 +00:00