www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
15,696 Commits 62 Branches 313 Tags
httpd-proxy-scoreboard
Commit Graph

15696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Frederic Clere
4f469515c2 missing apr include. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@431328 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-14 12:15:11 +00:00
Jean-Frederic Clere
c30c2715a7 Arrange ident around if and if else. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@429472 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-07 20:48:05 +00:00
Jean-Frederic Clere
29b7e9bac8 Remove shared memory before creating it. (That only removes the file!). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428700 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-04 11:44:01 +00:00
Jean-Frederic Clere
f50b00bad0 Set the health to unknown when exiting so that httpd 
could its retry logic.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428503 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 19:50:55 +00:00
Jean-Frederic Clere
abcc180710 Move health in proxy_worker_stat otherwise testing it in 
httpd is too complex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428492 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 19:31:12 +00:00
Jean-Frederic Clere
26d5e1681b Use only one slotmem for status and checker. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428437 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 16:01:50 +00:00
Jean-Frederic Clere
fa6fd6f3f3 Use a global pool for global pool. 
Remove the file containing the slotmems if its size has changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428435 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 15:56:20 +00:00
Jean-Frederic Clere
d98ed85ef9 Add a parameter for the filename. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428433 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 15:51:21 +00:00
Jean-Frederic Clere
0363bedc4e A presistence to the shared memory slotmem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428374 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 12:11:14 +00:00
Jean-Frederic Clere
ee0d40e5d2 Arrange the health_checker: add set_slotmem_storage_method(), 
create_slotmem() and attach_slotmem(). Arrange corresponding
files.

Start using the health logic in the balancer.

Arrange ap_proxy_add_worker_to_balancer().



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427623 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-01 15:44:33 +00:00
Jean-Frederic Clere
2212dca5d0 create and attach cannot be used before the globalmem has been initialized. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427505 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-01 09:46:00 +00:00
Jean-Frederic Clere
cf8c677b6c Remove health_worker_method for mod_proxy.h and 
mod_proxy_health_checker.h from the includes of proxy_util.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427267 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 21:02:57 +00:00
Jean-Frederic Clere
2518c933e0 Move what belongs to the health_checker in the health checker. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427145 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 15:43:11 +00:00
Jean-Frederic Clere
55af90f7b9 AJP needs to be register at IANA before beeing in apr_uri_port_of_scheme(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427103 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 12:40:01 +00:00
Jean-Frederic Clere
39f9634921 Allow anonymous shared memory. 
Arrange the mixing of checker size and proper httpd workers status in proxy_util.
Make slotmem.h multi times includable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426900 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-30 17:15:34 +00:00
Jean-Frederic Clere
f87da8ee19 Add ProxySlotMemLoc parameter: location of the file associated with the slot mem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426845 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 22:24:00 +00:00
Jean-Frederic Clere
6924bf0aff Rollback r426781. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426841 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 21:20:52 +00:00
Jean-Frederic Clere
6464834567 Copy the workers to the comarea for the checker in the post-config. 
(Instead doing it when parsing the configuration file).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426837 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 21:08:00 +00:00
Jean-Frederic Clere
d514bfb90b Create the directory for the path to the shared memory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426781 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 11:43:25 +00:00
Jean-Frederic Clere
837b3515be typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426779 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 10:18:59 +00:00
Jean-Frederic Clere
cc9e70f2c5 Stops when can't attach to httpd memory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426777 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 10:13:25 +00:00
Jean-Frederic Clere
4d1426fc1c Use id instead worker->id so that a rearrange to the slot mems is possible. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426732 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:56:23 +00:00
Jean-Frederic Clere
d262c6f776 Remove useless code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426727 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:40:32 +00:00
Jean-Frederic Clere
1910d1775d Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426723 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:34:18 +00:00
Jean-Frederic Clere
d8cb409f89 Use apr_pstrcat instead strcpy + strcat ... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426718 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:27:13 +00:00
Jean-Frederic Clere
36d27e847b Arrange stuff reported by Davi Arnaud. (thanks). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426717 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:20:21 +00:00
Jean-Frederic Clere
900139a150 Arrange the warning. Thanks Jim. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426708 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-28 23:37:15 +00:00
Jean-Frederic Clere
d0e5132941 First try to put togother an external health checker for mod_proxy. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426604 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-28 16:33:58 +00:00
Jean-Frederic Clere
b09239fa4a Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425764 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 15:36:05 +00:00
Jean-Frederic Clere
cd963e2fcf Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425761 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 15:26:49 +00:00
Jean-Frederic Clere
4963008b41 Try to have something that has the right size. 
The remaining problem is that proxy_lb_workers() only gives a good value when
the config file has been parsed (can't be used in preconfig().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425759 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 15:21:19 +00:00
Jean-Frederic Clere
cd6979529e Oops. item_size and item_num are pointers. Thanks Ruediger Pluem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425752 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 14:57:25 +00:00
Jean-Frederic Clere
3e5ef3ea80 Add ap_slotmem_attach() to the slotmem_storage_method. 
Cut mod_sharemem.c in 2 so that its features could be
used outside httpd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425734 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 13:42:43 +00:00
Jean-Frederic Clere
cd80ecf805 Correct small errors: Thanks Ruediger Pluem who review the code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@424059 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-20 20:49:56 +00:00
Jean-Frederic Clere
1005eae32f Arrange the licence. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@424045 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-20 20:21:03 +00:00
Jean-Frederic Clere
eb6c5271b9 Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423581 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 19:47:23 +00:00
Jean-Frederic Clere
e784ba6932 Allow to use the new slotmem providers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423451 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 12:54:07 +00:00
Jean-Frederic Clere
82229302b7 Add 3 memory handlers to replace the scoreboard area of mod-proxy. 
Note the mod_scoreboard.c just uses the actual scoreboard "shared" area
for the workers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423444 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 12:18:10 +00:00
Jean-Frederic Clere
f51dcc49a7 Branch to develop a proxy that would not used the scoreboard to store the 
"shared" information. That will allow health checkers to read the workers
configuration as well as a (limited) dynamic configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423393 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 07:23:45 +00:00
William A. Rowe Jr
5616f79841 Alas, it was not to be. Deprecate mod_aspdotnet, and certainly don't 
introduce these docs into the next release or consider for backport.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@423387 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 07:05:13 +00:00
Paul Querna
30a9c973ca Revert r422298, because it introduces GNU Make specific extensions to the Makefile, and should be replaced by doing the work inside configure, instead of the Makefile.in. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422925 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-18 00:11:46 +00:00
Ruediger Pluem
ef947df07e * Remove ourselves from the filter chain if we failed to init libz, as we 
pass data down the filter chain uncompressed afterwards.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422739 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-17 15:24:29 +00:00
Ruediger Pluem
e65116b777 * Fix potential memory leaks in deflate_out_filter if bailing out due to an 
error (either in the lower filter chain or during a libz operation). We need
  to call deflateEnd as it is very likely that this filter is never called
  again to ensures that libz's internal structures get cleaned properly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422736 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-17 15:08:27 +00:00
Ruediger Pluem
54c1b9749e * Fix wrong FLUSH bucket handling in deflate_out_filter: Actually the internal 
structures of libz never got flushed as ctx->stream.avail_in is always zero
  here. As the EOS and the FLUSH bucket case use the same code for flushing
  libz's internal buffers move this code to the new function flush_zlib_buffer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422731 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-17 14:32:50 +00:00
Paul Querna
d26fded1ef gen_test_char doesn't actually need the util_debug object to work. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422306 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 22:36:12 +00:00
Paul Querna
d19490ff9b Makefile.in: Don't try to compile checkgid and fcgistarter on win32 when using the autotools build system. 
/support: Update svn:ignore for generated exe files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422298 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 22:05:02 +00:00
Paul Querna
8744237828 Disable the getpwnam and getgrnam functions, since they aren't available on win32. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422201 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 10:01:33 +00:00
Paul Querna
bf508e3c68 include/ap_config.h: Include the autoconf generated header that defines what is available. 
configure.in: The times function is not really available on mingw32. Disable em.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422197 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 09:47:11 +00:00
Paul Querna
cb2e304ba8 On mingw32, the APACHE_MPM_DIR is defined from the autoconf generated files. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422191 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 09:25:28 +00:00
Paul Querna
f9d3d9f6a5 Bring in basic support for building the winnt MPM under mingw32, using the autoconf build system. Currently this will get you to the point of linking errors on gen_test_char. 
configure.in: Default to winnt MPM on mingw32 hosts.
configure.in: Add AP_DECLARE_EXPORT for mingw32 hsots.

os/config.m4: Use win32 dir under mingw32.
os/win32/Makefile.in: Add in a new makefile to generate libos on win32.

server/mpm/config.m4: Add winnt MPM to the help string.
server/mpm/config.m4: winnt MPM is a threaded MPM.

server/mpm/winnt/child.c: SO_UPDATE_ACCEPT_CONTEXT is defined under a different header in mingw32.

server/mpm/winnt/{Makefile.in,config.m4}: Base build for winnt MPM.

os/win32,server/mpm/winnt: Update svn:ignore for .deps/.libs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422182 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 09:03:52 +00:00