www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-09-11 09:30:48 +03:00
Code Activity
34,205 Commits 62 Branches 304 Tags
trunk
Commit Graph

73 Commits

Author SHA1 Message Date
Ruediger Pluem
aa4b05ee05 * Always trust content types that we set literally 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1918814 13f79535-47bb-0310-9956-ffa450edef68
 2024-07-02 06:35:53 +00:00
Rainer Jung
df3ba890a9 Fix numeric check for HeartbeatMaxServers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1902130 13f79535-47bb-0310-9956-ffa450edef68
 2022-06-21 10:10:29 +00:00
Rainer Jung
622fed589c *) mod_heartmonitor: Allow "HeartbeatMaxServers 0" 
to use file based storage instead of slotmem.
   Needed after setting HeartbeatMaxServers default
   to the documented value 10 in 2.4.54.
   [Jérôme Billira


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1902117 13f79535-47bb-0310-9956-ffa450edef68
 2022-06-20 20:54:14 +00:00
Christophe Jaillet
2ed8245800 The only caller of hm_processmsg() passes an apr_size_t for the last parameter, so be consistent and update the definition accordingly. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900340 13f79535-47bb-0310-9956-ffa450edef68
 2022-04-27 20:36:14 +00:00
Rainer Jung
6a0896d693 *) mod_heartmonitor: Set the documented default value 
"10" for HeartbeatMaxServers instead of "0". With "0"
     no shared memory slotmem was initialized. [Rainer Jung]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900026 13f79535-47bb-0310-9956-ffa450edef68
 2022-04-19 08:59:47 +00:00
Rainer Jung
3814c12e5a Revert r1899809: Will reapply using new 
changes-entries method for CHANGES handling.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900025 13f79535-47bb-0310-9956-ffa450edef68
 2022-04-19 08:58:07 +00:00
Yann Ylavic
56ee493d19 mod_heartmonitor: Fix setting and comparison of IPs fields. 
Setting or comparing hm_server_t and hm_slot_server_t IPs should not be base
on MAXIPSIZE since the former is potentially a smaller const char*.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1899841 13f79535-47bb-0310-9956-ffa450edef68
 2022-04-14 09:44:35 +00:00
Rainer Jung
c6099d586f mod_heartmonitor: Set the documented default value 
"10" for HeartbeatMaxServers instead of "0". With "0"
no shared memory slotmem was initialized.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1899809 13f79535-47bb-0310-9956-ffa450edef68
 2022-04-13 12:11:01 +00:00
Yann Ylavic
f461bcf12c Add missing pool tags to help debugging. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876599 13f79535-47bb-0310-9956-ffa450edef68
 2020-04-16 12:32:33 +00:00
Christophe Jaillet
b31270fa0f Axe an old and apparently out-dated comment. 
There is a typo in the comment.
HN_UPDATE_SEC has been renamed HM_UPDATE_SEC.
The TODO seems to have been taken into account in r759862.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1839249 13f79535-47bb-0310-9956-ffa450edef68
 2018-08-26 20:50:46 +00:00
Christophe Jaillet
ed6afb776a Revert r1839247 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1839248 13f79535-47bb-0310-9956-ffa450edef68
 2018-08-26 20:48:39 +00:00
Christophe Jaillet
090c518871 Axe an old and apparently out-dated comment. 
There is a typo in the comment.
HN_UPDATE_SEC has been renamed HM_UPDATE_SEC.
The TODO seems to have been taken into account in r759862.


Reverted in r1839248 and re-committed without un-expexted content in r1839249


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1839247 13f79535-47bb-0310-9956-ffa450edef68
 2018-08-26 20:41:13 +00:00
Christophe Jaillet
4f68e384a2 mod_heartmonitor: No need to search twice for the same value + fix some style 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727842 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-31 17:10:27 +00:00
Rainer Jung
af14d158a3 Added many log numbers to log statements that 
had none.

Those were not detected by the coccinelle script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 12:02:41 +00:00
Yann Ylavic
0a431ef862 core, modules: like r1657897 but for core and other modules than mod_proxy. 
More uses of ap_map_http_request_error() and AP_FILTER_ERROR so that we never
return an HTTP error status from a handler if some filter generated a response
already.

That is, from a handler, either ap_get_brigade() (an input filter) returned
AP_FILTER_ERROR and we must forward it to ap_die(), or ap_pass_brigade() (an
output filter) failed with any status and we must return AP_FILTER_ERROR in
any case for ap_die() to determine whether a response is needed or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665625 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-10 17:25:17 +00:00
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
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