Merge r314844, r320796 from trunk:

* support/ab.c (test): Increment count of started requests when a
non-blocking connect completes; avoids case where more requests are
made than intended.

* modules/ssl/ssl_engine_init.c (ssl_init_CheckServers): Fix IP/port
key generation which passed a bogus pointer for a %pA conversion,
hence could give false warnings for name-based-vhost use.

PR: 36966, 37051

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@320804 13f79535-47bb-0310-9956-ffa450edef68

Merge r314881 from trunk:

Performance Tune: Do the cheap and fast length check before
we bother doing a char-by-char comparison.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@314883 13f79535-47bb-0310-9956-ffa450edef68

Merge r314875 from trunk:

Fix -Wall warning... Thanks to Joe for the head's up!

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@314876 13f79535-47bb-0310-9956-ffa450edef68

Merge r312963 from trunk:

mod_proxy_balancer: BalancerManager and proxies correctly handle
member workers with paths. PR36816. [Ruediger Pluem, Jim Jagielski]

Reviewed by: jim, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312964 13f79535-47bb-0310-9956-ffa450edef68

Merge r265033 from trunk.

Author: trawick
Reviewed by: colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312911 13f79535-47bb-0310-9956-ffa450edef68

merge r265737 from trunk.

Author: trawick
Reviewed by: colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312906 13f79535-47bb-0310-9956-ffa450edef68

Backport the APACHE_CHECK_VOID_PTR_LEN and APACHE_CHECK_APxVER autoconf macros
from the trunk branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312904 13f79535-47bb-0310-9956-ffa450edef68

Backport new_features documentation updates to 2.2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307442 13f79535-47bb-0310-9956-ffa450edef68

Sync module moves (dbd, filter, charset_lite) and dbd updates with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307440 13f79535-47bb-0310-9956-ffa450edef68

Merge r307389 from trunk:

* Fix a declaration problem introduced in r195013 that is C99 but not ANSI C
  compatible. Thus move declaration of *worker to the top of find_session_route
  to make it ANSI C compatible again.

Submitted by: NormW <normw bocnet.com.au>
Reviewed by: Ruediger Pluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307393 13f79535-47bb-0310-9956-ffa450edef68

use Greg's cleaner fix for CAN-2005-2970

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307222 13f79535-47bb-0310-9956-ffa450edef68

Merge r307195 from trunk:

* Fix PR36883 (mod_proxy_ajp and tomcat issues).

Submitted by: William Barker <william.barker wilshire.com>
Reviewed by: Ruediger Pluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307196 13f79535-47bb-0310-9956-ffa450edef68

Backport Revision: 306495

  NET_TIME, as a standalone feature, was a horrid idea, so eliminate it.

  The core filter will NOT operate correctly across platforms
  (even between Linux/Solaris) without setting up the conn->timeout,
  so always apply the timeout when establishing the core filter.

  The keep-alive-timeout is entirely an HTTP-ism, and needs to
  move to the http protocol handler.  This isn't triggered in the
  event mpm, but the event mpm introspects s->keep_alive_timeout
  directly adding it to the pollset, so this is a non-sequitor.

  Finally, once the headers are read, the named virtual host may
  have a different (more/less permissive) timeout for the remainder
  of the request body.  This http-centric patch picks up that subtle
  detail and can switch to a named-vhost timeout.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307031 13f79535-47bb-0310-9956-ffa450edef68

Merge r293123, r293293 from trunk:

* run the request_status hook in proxy_handler if HTTP_SERVICE_UNAVAILABLE
  is returned by ap_proxy_pre_request.

Suggested by: Brian Akins <brian.akins turner.com>, Mladen Turk
Reviewed by: Jim Jagielski

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306900 13f79535-47bb-0310-9956-ffa450edef68

merge from trunk:

mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
trigger POLL_ERR or POLL_HUP on a terminated connection.

PR 36951.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306889 13f79535-47bb-0310-9956-ffa450edef68

Merge r295013 from trunk:

* Fix PR36507 (mod_proxy_balancer does not handle sticky sessions with
  tomcat correctly).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306884 13f79535-47bb-0310-9956-ffa450edef68

Get latex build working again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306832 13f79535-47bb-0310-9956-ffa450edef68

  docs/build/ should not exist (docs/manual/build/ already in svn:ignore).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306826 13f79535-47bb-0310-9956-ffa450edef68

  httpd-docs procedures call for checking out build underneath
  the docs/ tree, so add this subdirectory as an svn ignore

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306816 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306802 13f79535-47bb-0310-9956-ffa450edef68

bump version

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306798 13f79535-47bb-0310-9956-ffa450edef68

swap directive and module

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306787 13f79535-47bb-0310-9956-ffa450edef68

Backport: 300198

  Spare us a wasted variable, csd is initialized null, acting
  as the 'csd_set' indicator.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306784 13f79535-47bb-0310-9956-ffa450edef68

Backport 295141

  Pay close attention to core_create_req() ... and note
  that not one other member of the r->vars is initialized
  herein.  Move this initialization elsewhere.

  (If this is the 'default' - it really aught to be the
  zero value, for that matter).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306782 13f79535-47bb-0310-9956-ffa450edef68

Merge r295104 from trunk:

Refresh the SSL FAQ to bring it a little closer to reality.

Submitted by: Noirin Plunkett <firebird nerdchic.net>
Reviewed by: Joe Orton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@295105 13f79535-47bb-0310-9956-ffa450edef68

Merge r293364 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293365 13f79535-47bb-0310-9956-ffa450edef68

Sync with trunk; minor comment and camelcase consistency changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293318 13f79535-47bb-0310-9956-ffa450edef68

Sync with trunk; remove a now unused variable, and fix a comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293310 13f79535-47bb-0310-9956-ffa450edef68

Merge r239422 and r239423 from trunk; these are (long) casts to fix 64-bit
build warnings by asteinmetz. Tested on IA64, x64 and x86.

Originally by: asteinmetz
Reviewed by: colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293305 13f79535-47bb-0310-9956-ffa450edef68

* Backport of r293301 style fixes to ease diff with trunk.
  No Functional changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293302 13f79535-47bb-0310-9956-ffa450edef68

Whitespace and comment changes; inconsequential - but synchronises
with trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293292 13f79535-47bb-0310-9956-ffa450edef68

Sync with trunk: remove an unneccessary over-lapping variable (jorton)
and fix a style nit (colm).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293170 13f79535-47bb-0310-9956-ffa450edef68

Merge r265047 and r265049 from trunk. Use the correct PID formatting.
Originally by: Jim
Reviewed by: Colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293169 13f79535-47bb-0310-9956-ffa450edef68

Merge r265518-9 from trunk; explicit assignment of some global variables
to zero. These should not be neccessary, but help us get around a gcc
(on ia64 at least) optimisation bug. They are harmless anyway.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293164 13f79535-47bb-0310-9956-ffa450edef68

Merge r290162 from trunk. No policy changes, just update to pointing at
subversion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293162 13f79535-47bb-0310-9956-ffa450edef68

Merge r264886 from trunk:

* server/main.c (suck_in_APR): Remove weird gzeof reference which
broke all the -Werror builds.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292965 13f79535-47bb-0310-9956-ffa450edef68

merge from trunk:

*) SECURITY: CAN-2005-2970 (cve.mitre.org)
     worker MPM: Fix a memory leak which can occur after an aborted
     connection in some limited circumstances.  [Greg Ames, Jeff Trawick]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292949 13f79535-47bb-0310-9956-ffa450edef68

Backport recent fixes from trunk (hitherto lost in branch confusion)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292771 13f79535-47bb-0310-9956-ffa450edef68

re-add the brackets on Neale's email

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292565 13f79535-47bb-0310-9956-ffa450edef68

Merge r239406 with the 2.2.x branch. Again, no functional changes; this rev
moves some structures and define's shared by mod_disk_cache and htcacheclean
into a single mod_disk_cache.h.

Original Author: asteinmetz
Review by: colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292557 13f79535-47bb-0310-9956-ffa450edef68

Backport the Doxygen changes to the 2.2.x branch. No functional changes,
however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.

Submitted by: Neale Ranns <neale ranns.org>
Reviewed by:  Ian Holsman

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68

Merge r292434 from trunk:

de-ref bug - balancer is always not null since it's &balancer
from the caller.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292435 13f79535-47bb-0310-9956-ffa450edef68

Add a changes entry for the mod_dir/mod_cache stuff.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292432 13f79535-47bb-0310-9956-ffa450edef68

Merge r291588, r291672 and r291914 from trunk; make mod_dir and mod_cache
play nice together.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292423 13f79535-47bb-0310-9956-ffa450edef68

Merge r291558 from trunk:

As recommended by nd, build docs for all languages.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291559 13f79535-47bb-0310-9956-ffa450edef68

Roll on to 2.1.9-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291488 13f79535-47bb-0310-9956-ffa450edef68

Remove -dev, to prepare for 2.1.8 tagging.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291486 13f79535-47bb-0310-9956-ffa450edef68

Merge r291480 from trunk:

* Makefile.in
  (docs): If the "docs-build" project is available, trigger its build system
   to turn the XML sources into HTML.  Otherwise, display a URL to the
   instructions on how to use the docs build.

* build/rules.mk.in:
  (.PHONEY): docs is a fake target.

Submitted By: Daniel Rall <dlr apache.org>
Reviewed by: pquerna

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291485 13f79535-47bb-0310-9956-ffa450edef68

Merge r291452, r291454 from trunk:

* server/connection.c (ap_lingering_close): Fix lingering close to
really match the 1.3 behaviour: read from the client for up to ~30
seconds in total.  Current behaviour will attempt only 15 read() calls
then give up.

* server/connection.c (ap_lingering_close): Cleanup; no functional change.

PR: 35292

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291469 13f79535-47bb-0310-9956-ffa450edef68

Merge r290965 from trunk:

Implement a (bounded) buffer of request body data to provide a limited
but safe fix for the mod_ssl renegotiation-vs-requests-with-bodies
bug:

* modules/ssl/ssl_private.h (ssl_io_buffer_fill): Add prototype.

* modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill,
ssl_io_filter_buffer): New functions.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): If a
renegotiation is needed, and the request has a non-zero
content-length, or a t-e header (and 100-continue was not requested),
call ssl_io_buffer_fill to set aside the request body data if
possible, then proceed with the negotiation.

PR: 12355

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291425 13f79535-47bb-0310-9956-ffa450edef68

fix eol-style property

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291271 13f79535-47bb-0310-9956-ffa450edef68

Fix entry format and remove a docs change which is not really
significant enough to warrant its own CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291128 13f79535-47bb-0310-9956-ffa450edef68

Merge r291120 from trunk:

* server/request.c (core_opts_merge): When AllowOverride is specified
for the directory, ignore the inherited override_opts field.

PR: 35330
Submitted by: kabe <kabe sra-tohoku.co.jp>
Reviewed by: jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291125 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290970 13f79535-47bb-0310-9956-ffa450edef68

update German translation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290969 13f79535-47bb-0310-9956-ffa450edef68

Merge r290816 from trunk:

Add <glossary> tag for mime-type where appropriate.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290817 13f79535-47bb-0310-9956-ffa450edef68

Merge r290801, r290803 from trunk:

Add APR to the glossary and link it in where appropriate.

Missed an end tag in the glossary.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290805 13f79535-47bb-0310-9956-ffa450edef68

Merge r290760 from trunk:

Fix dtd to match <glossary> change in xsl.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290761 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290756 13f79535-47bb-0310-9956-ffa450edef68

update German translation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290754 13f79535-47bb-0310-9956-ffa450edef68

fix <glossay> validity

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290748 13f79535-47bb-0310-9956-ffa450edef68

  Add TraceEnable compatibility tag, and ./build.sh all causing
  lots and lots of noise this time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290730 13f79535-47bb-0310-9956-ffa450edef68

Merge r280018 from trunk:

Any failure in apr_stat on a symlink currently gives
"Symbolic link not allowed", which results in much head-scratching
if the actual problem is a broken link of some sort.  The real
fix would be to propogate the correct apr_stat error into the
error log, but that would require more refactoring than I'm
prepared to do.  This change simply expands the error message
to include both possibilities.  It improves the situation for
PR28515 but does not solve it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290727 13f79535-47bb-0310-9956-ffa450edef68

Merge r290712, r290720, r290723 from trunk:

The arrow indicator for a glossary link was cute, but I found it way too
disturbing to the flow of text.  Here I replace it with a dashed-unline.
Also, allow the omission of the ref attribute where the glossary term is
exactly equal to the link contents.

Omit reference to pre-2.0.48 versions.

Add some <glossary> markup for regular expression and regex.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290725 13f79535-47bb-0310-9956-ffa450edef68

Merge win32 htcacheclean addition into the 2.2.x branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290721 13f79535-47bb-0310-9956-ffa450edef68

Merge r290659 with the 2.2.x branch; add htcacheclean to the win32 build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290663 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290547 13f79535-47bb-0310-9956-ffa450edef68

fix TraceEnable docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290543 13f79535-47bb-0310-9956-ffa450edef68

`build all`

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290521 13f79535-47bb-0310-9956-ffa450edef68

  Sync to 2.0.x/CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290518 13f79535-47bb-0310-9956-ffa450edef68

  Backport TraceEnable docs to the 2.2-dev branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290496 13f79535-47bb-0310-9956-ffa450edef68

update German translation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290472 13f79535-47bb-0310-9956-ffa450edef68

Merge r290465 from trunk:

Fix Bug#: 25659 (Memory leak in ssl_util_algotypeof())
Reported by David Blake in 2003, including patch.

Reviewed by: martin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290466 13f79535-47bb-0310-9956-ffa450edef68

Merge r290459 from trunk:

Fix Bug#: 25659 (Memory leak in ssl_util_algotypeof())
Reported by David Blake in 2003, including patch.

Reviewed by: martin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290463 13f79535-47bb-0310-9956-ffa450edef68

`build all`

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290461 13f79535-47bb-0310-9956-ffa450edef68

As of the 2.2.x docs re-sync, this change is now in the 2.2.x branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290442 13f79535-47bb-0310-9956-ffa450edef68

Add the caching image to the 2.2.x branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290429 13f79535-47bb-0310-9956-ffa450edef68

Massive whopper of a translations update, to get the 2.2.x branch back in-sync.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290428 13f79535-47bb-0310-9956-ffa450edef68

Backport all outstanding docs/manual changes from trunk to the 2.2.x
branch. Only the SetEnvIf documentation was left out.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290427 13f79535-47bb-0310-9956-ffa450edef68

Backporting the caching user guide to the 2.2.x branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290416 13f79535-47bb-0310-9956-ffa450edef68

* update German translation
* update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290200 13f79535-47bb-0310-9956-ffa450edef68

add background faq to the sitemap

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290199 13f79535-47bb-0310-9956-ffa450edef68

* fix some eol-style properties
* add missing faq/background transformed files
* `build extraclean all`

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290198 13f79535-47bb-0310-9956-ffa450edef68

add missing property

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290195 13f79535-47bb-0310-9956-ffa450edef68

backport docs/manual/faq/background.xml from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290193 13f79535-47bb-0310-9956-ffa450edef68

bring build properties up-to-date

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290190 13f79535-47bb-0310-9956-ffa450edef68

Backport graceful-stop to the 2.2.x branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290189 13f79535-47bb-0310-9956-ffa450edef68

Backport r239710, r239711, r239732, r239740 and r241815 to the 2.2.x branch;
Fix PR 28167, which means we stop listening on ports when we do a
graceful-restart.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290179 13f79535-47bb-0310-9956-ffa450edef68

Merge r265702, r290136, r264800 from trunk:

* modules/ssl/ssl_util_ssl.c (SSL_X509_STORE_create): Catch errors
returned by X509_LOOKUP_add_dir or X509_LOOKUP_load_file to detect
malformed or misconfigured CRLs.  Clear error stack beforehand to
ensure reported errors are relevant.

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Fix gcc
4.x different-pointer-signedness warning.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that
renegotiation is performed for a transition from "SSLVerifyClient
optional" to "SSLVerifyClient require".  (CVE CAN-2005-2700)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290159 13f79535-47bb-0310-9956-ffa450edef68

Document the lbmethod naming is now bytraffic|byrequests not simply
traffic|requests

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290149 13f79535-47bb-0310-9956-ffa450edef68

Document re-impl to providers for mod_proxy_balancer lbmethods

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290144 13f79535-47bb-0310-9956-ffa450edef68

Backport of the following patches from trunk:

  r279973
  r279752
  r279579
  r279319
  r279305

------------------------------------------------------------------------
r279973 | jorton | 2005-09-10 05:10:27 -0400 (Sat, 10 Sep 2005) | 5 lines

* modules/proxy/mod_proxy_balancer.c (balancer_handler): Fix gcc
warning; no functional change.

* modules/proxy/mod_proxy.c (set_balancer_param): Likewise.

------------------------------------------------------------------------
r279752 | jim | 2005-09-09 08:28:02 -0400 (Fri, 09 Sep 2005) | 4 lines

Proxy balancer lbmethods are now registered as providers and not
via hooks. Move various find() functions back to mod_proxy_balancer
where they belong :)

------------------------------------------------------------------------
r279579 | bnicholes | 2005-09-08 12:37:00 -0400 (Thu, 08 Sep 2005) | 1 line

Remove proxy_hook_load_lbmethods from Netware export list

------------------------------------------------------------------------
r279319 | jim | 2005-09-07 09:14:16 -0400 (Wed, 07 Sep 2005) | 2 lines

Minor nit. Methods are server-wide, so simply use the base version table.

------------------------------------------------------------------------
r279305 | jim | 2005-09-07 08:04:15 -0400 (Wed, 07 Sep 2005) | 4 lines

Restruct of lbmethod find-best algo's, bypassing hook mechanism.
Looking into provider method, but until then... Prevent core dump
when balancer not in vhosts

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290141 13f79535-47bb-0310-9956-ffa450edef68

Backport r280013 from trunk:

gcc -Wall fix: depending on signedness of char.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290139 13f79535-47bb-0310-9956-ffa450edef68

Backport 280010 from trunk:

gcc -Wall cleanup

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290138 13f79535-47bb-0310-9956-ffa450edef68

Backport 279750 from TRUNK.

New provider function to list all available provider names in a
specific group and version (ap_list_provider_names).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290137 13f79535-47bb-0310-9956-ffa450edef68

Backport r239420 and r239421 to the 2.2.x branch; Enhance
CacheEnable/CacheDisable to be of use to proxy servers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290133 13f79535-47bb-0310-9956-ffa450edef68

Backport support for gigabytes in htcacheclean to the 2.2.x branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290118 13f79535-47bb-0310-9956-ffa450edef68

Remove that odd strerror() call in the 2.2.x branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290108 13f79535-47bb-0310-9956-ffa450edef68

Backport r239407 to the 2.2.x branch; Improve mod_disk_cache hit/miss ratio
by canonicalising the url key.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290107 13f79535-47bb-0310-9956-ffa450edef68

Backport two small htcacheclean fixes from trunk to the 2.2.x branch;

    1.) Open the cache files as binary types, so that htcacheclean can
        work properly on Windows.

    2.) Add an entry in support/README for htcacheclean

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@289977 13f79535-47bb-0310-9956-ffa450edef68