]>
granicus.if.org Git - apache/log
Stefan Fritsch [Tue, 31 Jan 2012 21:39:05 +0000 (21:39 +0000)]
Note some things that should be considered, but not shortly before a release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238821 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 20:54:22 +0000 (20:54 +0000)]
Remove changes from trunk CHANGES that have already
been backported to 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238810 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 20:51:11 +0000 (20:51 +0000)]
Fix typo which was already fixed in 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238808 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 19:43:10 +0000 (19:43 +0000)]
Remove unwanted tanslation leftover.
Was introduced in r1210120.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238768 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 19:04:59 +0000 (19:04 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Forward port of r1221304 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238749 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 18:59:30 +0000 (18:59 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Forward port of r1215501 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238746 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 18:38:02 +0000 (18:38 +0000)]
Sync docs with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238738 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 18:13:52 +0000 (18:13 +0000)]
Some doc updates
Forward port of r1234890 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238726 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Jan 2012 17:38:36 +0000 (17:38 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238703 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Jan 2012 17:37:08 +0000 (17:37 +0000)]
c/p error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238701 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Jan 2012 16:53:27 +0000 (16:53 +0000)]
Docco r1229021
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238695 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 14:00:14 +0000 (14:00 +0000)]
Fix copy&paste error in comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238545 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 13:51:03 +0000 (13:51 +0000)]
I guess that makes sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238528 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 11:49:34 +0000 (11:49 +0000)]
Add event MPM description.
Partial forward port of r1201214 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238405 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 11:45:18 +0000 (11:45 +0000)]
iThese deserve their place in httpd.conf on Windows
Foreward port of r1234291 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238402 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 11:38:22 +0000 (11:38 +0000)]
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
Stefan Fritsch [Sun, 29 Jan 2012 20:11:55 +0000 (20:11 +0000)]
Install multiple files per install.sh invocation
Libtool and BSD install support installing several files in one run.
Add support to install.sh and instdso.sh, too.
Replace for-loops in the Makefiles.
This reduces 'make install' time by approx. 50% because we save
lots of calls to the huge libtool shell script.
The AIX-specific magic in instdso.sh could use some testing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1237447 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 29 Jan 2012 18:22:35 +0000 (18:22 +0000)]
s/insure/ensure/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1237407 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 27 Jan 2012 14:51:24 +0000 (14:51 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1236701 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Jan 2012 19:14:58 +0000 (19:14 +0000)]
https also needs QS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1236350 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 26 Jan 2012 10:03:36 +0000 (10:03 +0000)]
* Don't typedef twice (in .c and .h file).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1236122 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 23 Jan 2012 21:58:42 +0000 (21:58 +0000)]
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
Joe Orton [Mon, 23 Jan 2012 16:57:07 +0000 (16:57 +0000)]
* server/core_filters.c (send_brigade_nonblocking): Use a non-blocking
bucket read, allowing any pending data to be flushed before trying a
(potentially slow) blocking read.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234899 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 23 Jan 2012 16:13:08 +0000 (16:13 +0000)]
Document how Include should behave. The present inconsistencies are now subject
of PR 52505 instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234876 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jan 2012 15:19:07 +0000 (15:19 +0000)]
* server/core_filters.c (ap_core_output_filter): Don't read the entire
output of a morphing bucket into RAM.
Submitted by: jorton, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234848 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 Jan 2012 15:04:09 +0000 (15:04 +0000)]
CVE-2012-0053: Fix an issue in error responses that could expose
"httpOnly" cookies when no custom ErrorDocument is specified for
status code 400.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234837 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 23:30:02 +0000 (23:30 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234644 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 23:26:31 +0000 (23:26 +0000)]
Fix docs for Include, add docs for IncludeOptional
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234643 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 23:19:57 +0000 (23:19 +0000)]
Add a validate-xml target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234642 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 18:50:21 +0000 (18:50 +0000)]
ctx->bytes_in is never used. Remove a useless iteration through the brigade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234574 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 18:27:11 +0000 (18:27 +0000)]
Improve indentation, no code change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234565 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jan 2012 13:27:38 +0000 (13:27 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234511 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 10:48:23 +0000 (10:48 +0000)]
Document the rather surprising code path on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234479 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 21 Jan 2012 10:26:51 +0000 (10:26 +0000)]
More configure time dependencies:
mod_cache_disk depends on mod_cache
mod_heartbeat depends on mod_watchdog
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234297 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 20 Jan 2012 22:14:31 +0000 (22:14 +0000)]
Make APACHE_MODULE() accept an optional prerequisite module for configure.
Introduce the following configure time dependencies:
mod_proxy_* (except proxy_html) require mod_proxy
mod_dav_* require mod_dav
mod_session_* require mod_session
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1234180 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Jan 2012 12:41:18 +0000 (12:41 +0000)]
* server/core_filters.c (ap_core_input_filter): Only treat EAGAIN as
success if a non-blocking read was requested; for a blocking read,
it is an error condition.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1233882 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Jan 2012 22:23:15 +0000 (22:23 +0000)]
Adjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on
core's translate-name to fail unsupported URIs.
Rewrite and proxy now decline what they don't support rather
than fail the request.
Suggested by: trawick
Implemented by: jorton
Tweaked by: wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1233604 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 18 Jan 2012 11:30:27 +0000 (11:30 +0000)]
configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232838 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Jan 2012 22:58:23 +0000 (22:58 +0000)]
Anticipate win32+win64
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232630 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Jan 2012 22:50:13 +0000 (22:50 +0000)]
Service named 2.x on trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232624 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Jan 2012 22:49:16 +0000 (22:49 +0000)]
Further win32 edits anticipating 1.0.1-final is soon
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232622 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 17 Jan 2012 21:41:24 +0000 (21:41 +0000)]
Reword the paragraph about --with-included-apr to mention the -deps
tarball.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232594 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 17 Jan 2012 21:30:22 +0000 (21:30 +0000)]
Trunk is at 2.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232583 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 17 Jan 2012 21:12:19 +0000 (21:12 +0000)]
configure: Improve the error message when --with-included-apr is specified
but either APR or APR-Util is not included.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232575 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 16 Jan 2012 23:17:23 +0000 (23:17 +0000)]
RPM: Add mod_bucketeer, mod_case_filter and mod_case_filter_in to the RPM
spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1232224 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 15 Jan 2012 22:46:12 +0000 (22:46 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231783 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Jan 2012 01:40:32 +0000 (01:40 +0000)]
generated files and revision numbers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231608 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Jan 2012 01:36:45 +0000 (01:36 +0000)]
fix syntax errors in Mutex examples
Submitted by: Daniel Shahaf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231607 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Jan 2012 00:27:57 +0000 (00:27 +0000)]
fix const warning with strchr->ap_strchr mapping
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231602 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Jan 2012 00:27:16 +0000 (00:27 +0000)]
remove unused function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231601 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2012 15:58:59 +0000 (15:58 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231518 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2012 15:01:11 +0000 (15:01 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231510 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2012 14:53:49 +0000 (14:53 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231509 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2012 14:51:08 +0000 (14:51 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231508 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 14 Jan 2012 07:33:30 +0000 (07:33 +0000)]
Fix the request/response header error
Submitted by: INOUE Seiichiro <inoue ariel-networks.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231446 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 14 Jan 2012 06:38:39 +0000 (06:38 +0000)]
Add svn:keywords LastChangedRevision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231442 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 13 Jan 2012 19:18:03 +0000 (19:18 +0000)]
whitespace only: shift a block refactored in r1231255 over 8 spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231257 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 13 Jan 2012 19:16:50 +0000 (19:16 +0000)]
*) mod_authnz_ldap: Don't try a potentially expensive nested groups
search before exhausting all AuthLDAPGroupAttribute checks on the
current group. PR52464
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1231255 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Jan 2012 22:24:10 +0000 (22:24 +0000)]
add compat info to CacheQuickHandler
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1230286 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Jan 2012 14:33:47 +0000 (14:33 +0000)]
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
Roy T. Fielding [Wed, 11 Jan 2012 08:29:46 +0000 (08:29 +0000)]
More registered media types
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229930 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 15:55:25 +0000 (15:55 +0000)]
Update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229222 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 15:25:05 +0000 (15:25 +0000)]
Fix English Revisions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229201 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Jan 2012 13:08:11 +0000 (13:08 +0000)]
Fix cut'n'paster error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229136 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Jan 2012 13:06:18 +0000 (13:06 +0000)]
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
Takashi Sato [Mon, 9 Jan 2012 12:41:42 +0000 (12:41 +0000)]
Add <glossary> to nroff.xsl and revert r1222335 partially.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229116 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 11:47:28 +0000 (11:47 +0000)]
Fix XML validation error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229099 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 08:27:00 +0000 (08:27 +0000)]
Sync with 2.2 branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229059 13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Mon, 9 Jan 2012 04:20:46 +0000 (04:20 +0000)]
Changes to mod_heart* docs upon review by rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1229024 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 9 Jan 2012 04:01:06 +0000 (04:01 +0000)]
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
Eric Covener [Sun, 8 Jan 2012 16:57:55 +0000 (16:57 +0000)]
rewrite guesses URL or Filesystem in server context, but treats everything
as a URL in per-dir context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1228894 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 8 Jan 2012 10:08:19 +0000 (10:08 +0000)]
fix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1228816 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 8 Jan 2012 01:40:01 +0000 (01:40 +0000)]
optimize this... Do strlen() ONLY if we need to check
for overflow.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1228766 13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Sat, 7 Jan 2012 19:10:28 +0000 (19:10 +0000)]
Update heartbeat module documentation, add documentation for mod_watchdog
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1228700 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jan 2012 18:15:08 +0000 (18:15 +0000)]
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
William A. Rowe Jr [Fri, 6 Jan 2012 00:35:54 +0000 (00:35 +0000)]
Simple edit, when 'saved' this will always alphasort anyways
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1227910 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jan 2012 21:50:31 +0000 (21:50 +0000)]
Cure size_t abuse, curse some recent code [recommit good bits from r1227852]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1227856 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jan 2012 21:48:21 +0000 (21:48 +0000)]
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
William A. Rowe Jr [Thu, 5 Jan 2012 21:43:24 +0000 (21:43 +0000)]
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
Eric Covener [Thu, 5 Jan 2012 15:45:01 +0000 (15:45 +0000)]
Update the comment and checks around address/connection reusability
in mod_proxy.
The checks and comment are a vestige of 2.0.x
mod_proxy_http where the backend proxy conn was stored in
the frontend r->conn_config, but ap_proxy_determine_connection()
doesn't associate the frontend and backend conns like this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1227642 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jan 2012 15:41:47 +0000 (15:41 +0000)]
restore the generic proxy workers to not being address-reusable.
The guts of mod_proxy is not really ready for the addr and host on a
proxy_conn_rec to change over time and differ from the 1 cached in the worker.
* proxy_worker->cp->addr needs to know what host/port it cached
* conn->addr and conn->hostname need to be allocated from their own subpool
so they can be cleared as they change
* ap_proxy_determine_connection needs to be more careful about which
addr is the TCP endpoint and what we have in either cache.
* may need to avoid updating the proxy_worker addr cache if we know
the value is flipping.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1227637 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jan 2012 20:48:22 +0000 (20:48 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1226942 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jan 2012 13:26:45 +0000 (13:26 +0000)]
add heartbeat to list of lb methods living in other modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1226775 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jan 2012 02:11:25 +0000 (02:11 +0000)]
fill in the heartbeat modules' documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1226603 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 2 Jan 2012 22:52:11 +0000 (22:52 +0000)]
s/2011/2012/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1226563 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Jan 2012 17:18:39 +0000 (17:18 +0000)]
add/enhance some hints about configuration section merging (or lack of it in
the case of mod_access_compat)
PR52406
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1226477 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Jan 2012 09:00:55 +0000 (09:00 +0000)]
Add a bit of debug logging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1226375 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Jan 2012 04:17:46 +0000 (04:17 +0000)]
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
Stefan Fritsch [Fri, 30 Dec 2011 11:00:31 +0000 (11:00 +0000)]
Display registered providers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225799 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 30 Dec 2011 10:55:00 +0000 (10:55 +0000)]
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
Stefan Fritsch [Fri, 30 Dec 2011 10:52:51 +0000 (10:52 +0000)]
Sort list of modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225796 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 30 Dec 2011 10:49:43 +0000 (10:49 +0000)]
Display all those shiny new hooks that we have in 2.4
Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225795 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 30 Dec 2011 10:39:00 +0000 (10:39 +0000)]
Fix another case of #ifdef-within-a-macro (which was inadvertently
introduced a few days ago).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225791 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Dec 2011 09:07:48 +0000 (09:07 +0000)]
Document the unfortunate side effect of converting ap_log_*error into macros
with respect to #ifdef.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225478 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Dec 2011 08:57:55 +0000 (08:57 +0000)]
Don't use #ifdef inside macro calls
The behavior is undefined according to C99 6.10.3.11 and it breaks with
xlc on AIX
PR: 52394
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225476 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 23:15:04 +0000 (23:15 +0000)]
SECURITY: CVE-2012-0021 (cve.mitre.org)
Fix segfault when trying to log a nameless valueless cookie
PR: 52256
Submitted by: Rainer Canavan <rainer-apache 7val com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225380 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 16:33:11 +0000 (16:33 +0000)]
Fix handling of piped, syslog, or inherited ErrorLog entries
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225223 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 14:54:49 +0000 (14:54 +0000)]
Check during configtest that the directories for error logs exist
Testing under Windows is welcome
PR: 29941
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225199 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 14:50:44 +0000 (14:50 +0000)]
Fix -DDUMP_RUN_CFG output for piped and syslog loggers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225198 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 14:48:28 +0000 (14:48 +0000)]
Adapt loglevel of config errors during second pass
Don't use APLOG_STARTUP since at that point, the error log is already
available. This gives us timestamps if these errors happen during graceful
restart.
Use level 'emerg' as these errors are fatal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1225197 13f79535 -47bb-0310-9956-
ffa450edef68