1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Commit Graph

57 Commits

Author SHA1 Message Date
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
Stefan Fritsch
b9dacea0ea remove some dead code
found by clang statical analyzer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 17:25:40 +00:00
Graham Leggett
cb21a0dbcc Further clarify the naming of the entity that directly connects to us by
calling that entity a client instead of a peer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214015 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:10:52 +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
Stefan Fritsch
b4ec041ba7 Remove more log message prefixes that are now redundant as the
the error log format includes the module name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208110 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 22:28:21 +00:00
Graham Leggett
900f5cafda Replace a missed version of remote_addr with the new peer_addr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206587 13f79535-47bb-0310-9956-ffa450edef68
2011-11-26 20:55:29 +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
Jeff Trawick
ef947618a6 fix spelling error in a couple of log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171849 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 23:16:19 +00:00
Guenter Knauf
e80ada7b52 Continue if the platform doesnt support file perms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171847 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 23:10:32 +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
Stefan Fritsch
51692222f6 Various code cleanup
PR: 51398
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138627 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 20:45:34 +00:00
Jeff Trawick
782c711893 fix some dead assignments found by the clang analyzer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098162 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 21:18:58 +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
Graham Leggett
8df5fda30a Fix spelling of the handler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024445 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 22:40:15 +00:00
Graham Leggett
9943978a7d Avoid unnecessariy initialisation before we test handler name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024443 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 22:39:30 +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
Graham Leggett
ad308e2343 Make the error message correspond to the code, which sets APR_SO_NONBLOCK.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907105 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 21:37:56 +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
Jeff Trawick
e054fa7183 change the callable functions in the mod_watchdog API
to optional hooks to avoid module ordering or other symbol
resolution issues; affected:

  ap_watchdog_get_instance
  ap_watchdog_register_callback
  ap_watchdog_set_callback_interval


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820427 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 20:00:37 +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
9518cc6237 Add slotmem storage logic for multicast logic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@819949 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 13:50:42 +00:00
Jean-Frederic Clere
dcd3a1ebfb Oops my bad: Stop copying and pasting code.
Remove argstr_to_table and use qs_to_table.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@800685 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 06:49:48 +00:00
Jean-Frederic Clere
ede6e93b11 Fix warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@800319 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 11:48:40 +00:00
Jean-Frederic Clere
0d6b9d370d Add the file logic for the handler.
(Next step add the slotmem logic for the multicast socket).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@799334 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:37:22 +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
Jim Jagielski
249ada6b69 Align logic and message :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@798695 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 20:13:18 +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
Guenter Knauf
a427710d5e fixed types, fixed NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791682 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 02:54:27 +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
William A. Rowe Jr
35243888d2 cleanup truncation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775257 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 17:46:29 +00:00
Ruediger Pluem
2d04bc77eb * Add missing include to fix compiler warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@765735 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 20:00:14 +00:00
Jean-Frederic Clere
2c15909ac0 write Ok to tomcat.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@764804 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 14:48:34 +00:00
Jean-Frederic Clere
eb25ea2276 Add a logic to use an handler and HTTP.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@764762 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 13:01:54 +00:00
Jean-Frederic Clere
b2b55733ee Remove the C++ style comment and use 1 for keep_running.
(Thanks Rüdiger).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@763151 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 09:12:32 +00:00
Jean-Frederic Clere
ebd6c22532 Arrange traces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@762771 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 13:38:01 +00:00
Jean-Frederic Clere
27ce291f0c Set keep_running and clean pool if not.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@762730 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 12:10:57 +00:00
Jeff Trawick
0acd50d150 clean up apr_time_from_msec() compatibility macros
* where needed, base on APR_VERSION_AT_LEAST() so we remember what this is about
* where not, axe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@761084 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 22:06:49 +00:00
Mladen Turk
772241ef68 Use named watchdog for heartmonitor.
The watchdog has zero interval, leaving to the callback to determine the running loop.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759862 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 08:07:59 +00:00
Paul Querna
78aa2421a7 * modules/cluster/mod_heartmonitor.c
(hm_update_stats): Flush heartbeat file before closing, to make sure the file
    is always written correctly, and check for errors on flush or close.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759131 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 13:27:44 +00:00
Paul Querna
0a0ac63f29 Use cmd->temp_pool for temp allocations during configuration.
Suggested by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724092 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:23:04 +00:00
Paul Querna
5aa5f9850d Make ctx:status an apr_status_t, and be consistent about checking and setting it.
Suggested by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724091 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:15:40 +00:00
Paul Querna
d9ceaf6a9b Use APR_THREAD_FUNC for heart{beat,monitor} thread workers.
Suggested by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724090 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:11:42 +00:00
Paul Querna
b2d3c5d5a5 Also init mutex_path in hm_create_config.
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723679 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:20:19 +00:00
Paul Querna
c283a61afb Print the correct enum value for the lock mech.
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723677 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:16:20 +00:00
Paul Querna
d9370018b8 Add a comment explaining the start mutex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723675 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:14:14 +00:00
Paul Querna
e5c05b8707 Log the correct function name.
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723674 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:12:52 +00:00