www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
26,123 Commits 62 Branches 306 Tags
a902bda00305697d3bea379db7aa0894de8e5a1e
Commit Graph

51 Commits

Author SHA1 Message Date
Christophe Jaillet
a95a9fc800 Use apr_pstrmemdup instead of apr_pstrndup when this is safe. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1549676 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-09 20:52:26 +00:00
Jeff Trawick
58c1a25a96 mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/ 
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1364695 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-23 16:01:43 +00:00
William A. Rowe Jr
07e32f24db Revert a whole mess that was not ment to be committed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227855 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:48:21 +00:00
William A. Rowe Jr
0d1f9f658a Cure size_t abuse, curse some recent code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227852 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:43:24 +00:00
Stefan Fritsch
53164d250f Various fixes for log message tags: 
- Remove tags in ssl_log_ssl_error() and ssl_log_cert_error()
- Instead add tags to various ssl_log_xerror, ssl_log_cxerror
  calls (ssl_log_rxerror is unused).
- likewise for modssl_proxy_info_log()

- Fix spelling of APLOG_NOERRNO in coccinelle script
- add support for ssl_log_*error and ap_log_cserror

- add some more tags missing due to APLOG_NOERRNO spelling error

- Remove tags from example modules (we don't want people to blindly copy
  those)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211680 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 22:33:35 +00:00
Stefan Fritsch
0ecd2fe5e5 Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211663 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 21:59:16 +00:00
Stefan Fritsch
6f6ecbeae7 Change the provider names to match the module names: 
mod_slotmem_shm: shared -> shm
mod_socache_memcache: mc -> memcache


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210221 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-04 21:03:34 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 23:02:04 +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
Jim Jagielski
984c3a345c Move useful and shared balancer stuff to the shm slot... 
Provide hooks for post-config/runtime addition of
balancers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206286 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:28:14 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:39:32 +00:00
Stefan Fritsch
2d4e23d88b Create wrapper API for apr_random; 
use in mod_lbmethod_heartbeat and mod_serf to
- replace some needles use of apr_generate_random_bytes
- remove code duplication


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171247 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-15 19:53:59 +00:00
Jim Jagielski
a6f26af093 Implement draining capability for proxy workers... only accept 
sticky on these puppies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1170256 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-13 17:26:57 +00:00
Jeff Trawick
7eb1caed9a fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146737 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-14 14:47:59 +00:00
Jim Jagielski
2aef21903c Cleanup... most don't need apr_hooks.h at all... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101067 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-09 15:36:32 +00:00
Jim Jagielski
b405eca038 Implement reset() funcs for the LBmethods... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087407 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-31 18:41:23 +00:00
Stefan Fritsch
385da96d50 Use ap_state_query() to fix many modules that were not correctly initializing 
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070153 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-12 21:23:56 +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
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
William A. Rowe Jr
3e338e488c Elaborate on low hanging XXX fruit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885689 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-01 08:44:11 +00:00
Jean-Frederic Clere
3c6bce62c6 When pick was zero no worker where choosen. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@823093 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-08 08:52:14 +00:00
Jean-Frederic Clere
c673a9f77e Oops the slotmem uses apr_time_now. Can't use stat on shared memory :-) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@822758 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-07 14:36:49 +00:00
Jim Jagielski
2810699d0c Try to have consistent interface regardless of slotmem or 
file-based.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820388 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-30 18:58:34 +00:00
Jean-Frederic Clere
406bf000e2 Add port in the logic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820213 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-30 08:50:57 +00:00
Jean-Frederic Clere
6b75969829 typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@819962 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-29 14:16:50 +00:00
Jeff Trawick
7dc5818d99 mark some private module data as "static", resolving 
a duplicate definition error from the linker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798923 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-29 14:38:02 +00:00
Jeff Trawick
42ef5ed945 fix type mismatch in argument to attach() method 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798921 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-29 14:28:31 +00:00
Jean-Frederic Clere
d072258f05 Put the hm_slot_server_t in a common include. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798507 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-28 12:28:18 +00:00
Ruediger Pluem
65f63d24a8 * Silence compiler warnings about unused variables. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@792407 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-09 06:07:36 +00:00
Jean-Frederic Clere
84c7d1c676 Add use slotmem. Directive HeartbeatMaxServers > 10 to activate the logic. 
Otherwise it uses the file logic to store the heartbeats.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791617 13f79535-47bb-0310-9956-ffa450edef68
 2009-07-06 21:14:21 +00:00
Jean-Frederic Clere
ab9ed6d974 server_rec *r... Oops should be server_rec *s. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774239 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 06:55:57 +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
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
William A. Rowe Jr
b7eba4ab7f Add balancer module targets 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771564 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 04:58:44 +00:00
Jim Jagielski
7e145e7312 Fold in initial template for methods to be able to 
reset (initialize) and "age" their data, useful when
adding new workers, or when workers come back into
the fold....

Logic and code to come in a bit :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@769020 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-27 15:02:40 +00:00
Jim Jagielski
197c5ef541 Correct logic with non-seq lbsets config'ed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739854 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-01 21:53:05 +00:00
Jim Jagielski
0af11397c1 Correct logic with non-seq lbsets config'ed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739853 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-01 21:52:54 +00:00
Jim Jagielski
90c8377961 Correct logic with non-seq lbsets config'ed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739852 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-01 21:52:38 +00:00
Rainer Jung
4f75107ee0 Use default object file in APACHE_MODULE calls 
when possible.

It seems that's the way it is used for most modules,
so remove unnecessary explicit object file lists.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730829 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-02 19:43:09 +00:00
Paul Querna
5eb866768d Fix C90 forbids mixed declarations and code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728547 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-21 22:58:56 +00:00
Jim Jagielski
500d4a7c83 Remove safe duplication... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726217 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-13 15:12:06 +00:00
Jim Jagielski
0b645bf324 OK, instead of an igly hack, just use the normal 
build system impl to force balancer's config to
happen post proxy 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724367 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-08 14:51:50 +00:00
Jim Jagielski
c27585f6e4 Explain some things 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724360 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-08 14:31:30 +00:00
Jim Jagielski
826cb7f002 Force the lbmethod submodules to be loaded AFTER 
mod_proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724358 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-08 14:28:28 +00:00
Paul Querna
54d13fef11 Make the max time from when we last saw a host a compile time option. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723685 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:29:52 +00:00
Jim Jagielski
c26d704939 Allow for ind lbs to build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722951 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:07:50 +00:00
Jim Jagielski
7945337ff0 Add in independent bytraffic lbmethod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722950 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:07:11 +00:00
Jim Jagielski
49c39903be Add in independent byrequests lbmethod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722949 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:06:43 +00:00
Jim Jagielski
54ab9d06cb Add in independent bybusyness lbmethod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722948 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:06:13 +00:00
Jim Jagielski
0ba3876a2d And allow for the submod to be built 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722920 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 15:04:17 +00:00