www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
23,119 Commits 62 Branches 306 Tags
4c3bf430cc419fcb417a0510dd5b74baa4ee9d2d
Commit Graph

1586 Commits

Author SHA1 Message Date
Ruediger Pluem
e948002f96 * Add the forcerecovery balancer parameter that determines if recovery for 
balancer workers without considering the retry value of workers is enforced.
  There might be cases where an already overloaded backend can get into deeper
  trouble if the recovery of all workers is enforced without considering the
  retry parameter of each worker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1306409 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-28 15:22:40 +00:00
Ruediger Pluem
b794edf687 * Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing 
the global variable with the same name and create a bogus assignment.

Pointed out by: Eric Covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303827 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-22 15:15:26 +00:00
Guenter Knauf
2e728d6ee5 Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build. 
Added the missing AP_DECLARE* decorations for the function 
implementations and variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303201 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-20 23:15:05 +00:00
Jeff Trawick
7f74a624c0 revert r1294936, which fixed MPM DSO load failures on AIX 
it breaks the Netware build and was also missing the 
AP_DECLARE* decorations for the function implementations and
variables


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301277 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-15 23:51:35 +00:00
Jim Jagielski
deab2b5786 Bump 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298432 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-08 15:40:40 +00:00
Jim Jagielski
25c27c59dd Docs (and minor comment change) for DefaultRuntimeDir directive 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297959 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-07 12:51:04 +00:00
Jim Jagielski
fc1b444d2e Fold on Jeff's DefaultRuntimeDir impl... docs on the way 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297955 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-07 12:31:58 +00:00
Jeff Trawick
a1f372edf2 Fix MPM DSO load failure on AIX. 
Without the proper AP_DECLARE*, these functions used by MPMs
were not exported from httpd on AIX, resulting in symbol
resolution errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294936 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-29 01:52:17 +00:00
Stefan Fritsch
7a8f5c88aa Take care not to call ap_start_lingering_close from the listener thread, 
because it may block when flushing data to the client.

From the listener thread, do a lingering close without flushing. This is
OK because we only do this if there has been an error during write
completion or if our send buffers are empty because we are in keep-alive.

PR: 52229


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294356 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-27 22:04:54 +00:00
Stefan Fritsch
cba7493ed6 Fix another compiler warning 
Submitted by: Daniel Shahaf <danielsh elego de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293535 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 05:30:43 +00:00
Stefan Fritsch
ea8cd427b2 Fix compiler warning 
Submitted by: Daniel Shahaf <danielsh elego de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293534 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 05:28:11 +00:00
Stefan Fritsch
f36eefcf6f Fix MMN in comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293427 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-24 21:27:37 +00:00
Stefan Fritsch
401b5be562 In maintainer mode, replace apr_palloc with a version that 
initializes the allocated memory with non-zero values, except if
AP_DEBUG_NO_ALLOC_POISON is defined.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293408 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-24 20:47:01 +00:00
Stefan Fritsch
cf345c4512 Add AP_HAVE_C99 to make correct check for C99 less onerous 
Using __STDC_VERSION__ without checking if it is defined causes warnings
on C89.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1292043 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-21 21:36:37 +00:00
Rainer Jung
0415804814 BZ 52623: Fix building against PCRE 8.30. 
PCRE dropped support for pcre_info() which is
deprecated since a long time. Use pcre_fullinfo()
instead, which exists since version 3.0 of PCRE.

Patch provided by Ruediger Pluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243176 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-11 22:45:37 +00:00
Graham Leggett
9a0981b88d Fix spelling. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242967 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-10 22:45:48 +00:00
Stefan Fritsch
1bbff8f19b Replace ap_create_core_ctx()/ap_core_ctx_get_bb() with a hook 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240470 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-04 09:44:19 +00:00
Stefan Fritsch
d79b3c1513 Fix various filter functions to return apr_status_t instead of int 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240315 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 19:48:01 +00:00
Rainer Jung
ab76ab0bb0 Forgot to bump MMN when advancing the 
MODULE_MAGIC_COOKIE for trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239073 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 11:12:02 +00:00
Rainer Jung
d8e782ea5c I guess that makes sense. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238528 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 13:51:03 +00:00
Rainer Jung
6f9bc21613 Update copyrights for externally visible and changed code 
Forward port of r1234336 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238399 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 11:38:22 +00:00
Stefan Fritsch
e499c6e683 Make the core input/output filter contexts private and provide accessor APIs 
for mpm_winnt and mod_ftp.

This allows to add members to the context structs without breaking binary
compatibility.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1235019 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 21:58:42 +00:00
Joe Orton
65718cf0f5 SECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child 
changes the sb_type field in the scoreboard.  Since unprivileged
children should not be able to affect the parent in this way, this is
treated as a Low severity security issue.

Thanks to "halfdog" <me halfdog.net> for reporting this issue.

* include/scoreboard.h (global_score): Remove sb_type field.

* include/ap_mmn.h: Bump MMN for above.

* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
  Use a static global to store store the scoreboard type.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1230065 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 14:33:47 +00:00
Stefan Fritsch
3b2b67b26f Fix cut'n'paster error 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229136 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 13:08:11 +00:00
Stefan Fritsch
75dad9d44f Rename ap_func_attr_* macros to AP_FN_ATTR_* 
Add macro for attribute alloc_size on newer gcc's


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229134 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 13:06:18 +00:00
Nick Kew
e0ddfe0fdf Core configuration: add AllowOverride option to treat syntax 
errors in .htaccess as non-fatal.
PR 52439



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229021 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 04:01:06 +00:00
William A. Rowe Jr
2aa21a62b1 Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly 
excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228323 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 18:15:08 +00:00
Stefan Fritsch
c77318c46e Avoid using C++ reserved word 'new' in arg name in header 
Doc tweaks


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1226339 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-02 04:17:46 +00:00
Stefan Fritsch
caa0647d4d Add new ap_list_provider_groups() API for mod_info 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225798 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 10:55:00 +00:00
Jim Jagielski
9675b7484f Allow for changing of string more easily... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214296 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 15:29:19 +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
Graham Leggett
2af2fa44ad Further clarify the naming of the entity that originates the request by 
calling that entity a useragent instead of a client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214003 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 00:31:51 +00:00
Stefan Fritsch
91ce790cd3 Limit length of lines in .htaccess to 8K again, to reduce DoS potential. 
Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1213338 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 17:50:33 +00:00
Joe Orton
fd967eab44 * include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving 
private interfaces into a separate group.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211490 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 16:06:16 +00:00
Joe Orton
0071b626f2 * include/: Various doxy markup tweaks. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211364 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 10:06:21 +00:00
Joe Orton
abeba696e8 * include/util_varbuf.h: Doxygen tweaks. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211351 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 09:40:41 +00:00
Stefan Fritsch
45750ca9ee -1 to introducing new months so late in the release cycle 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210219 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-04 20:58:51 +00:00
Graham Leggett
ea4340c12a mod_proxy: Note that proxy_lb_workers was removed from the public API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210019 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-03 21:51:55 +00:00
Graham Leggett
7d3c369168 MMN bump for the removals from the public mod_proxy API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209956 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-03 17:24:30 +00:00
Stefan Fritsch
daea1baa46 update MMN, not only the comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209773 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 23:09:31 +00:00
Stefan Fritsch
b3cde50489 Add APLOGNO() macro for unique tags for every log message. 
Add some scripts to make adding these tags easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209743 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 22:26:54 +00:00
Graham Leggett
45eb1cdd06 mod_session: Use apr_status_t as a return code across the mod_session API, 
clarify where we ignore errors and why.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209603 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 17:47:05 +00:00
Graham Leggett
d0d00b5d01 mod_cache: Apply the API change that allows future mod_cache providers to 
invalidate cache entries, which will fix PR15868.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208822 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 21:56:11 +00:00
Graham Leggett
394e5594d6 Introduce a per connection "peer_ip" and a per request "client_ip" to 
distinguish between the raw IP address of the connection and the effective
IP address of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206291 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:42:04 +00:00
Jim Jagielski
f66d79b8b2 Use varargs... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205894 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-24 15:53:16 +00:00
Stefan Fritsch
ea54b8b1d5 fix comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205564 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-23 20:24:49 +00:00
Jim Jagielski
d2342460fd Add ap_pass_brigade_fchk() which does a Filter CHecK on the 
brigade pass.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205419 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-23 14:52:43 +00:00
Graham Leggett
4ee7eea4cf Introduce a per request version of the remote IP address, which can be 
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204968 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-22 13:10:39 +00:00
Stefan Fritsch
e0184da329 Pass ap_errorlog_info to error_log hook. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204614 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 17:36:26 +00:00
Stefan Fritsch
ab7b448082 Fix segfault caused by r1204104 on non-async mpms. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204180 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-20 16:41:42 +00:00