backport r1031038 from trunk:
    PR#47935 some people think s/except/unless makes this somewhat contrived RewriteCond example clearer.

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

Mention Satisfy in the HowTo, as per PR46256

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

PR#17239 - mention the logical relation of multiple "Require" statement.

Not required in trunk where we have the new authz containers.

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

Adding the french translation for mod_auth_digest

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

Add fixes from rjung and minfrin.

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

Patch from jean-frederic - :8009 implies ajp

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

Adding french translation for mod_authn_file

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

Vote

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

Adding a very short note, at the very top of the document, so that people with access to main server config will avoid .htaccess files.

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

INtroducing the french translation of the htaccess howto

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

Rebuild transformations.

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

Document RewriteLog format.

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

Last (minor) fixes on the auth howto .fr translation

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

Applying a small fix on previous commit

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

Adding french translation for 2.2 auth howto

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

Merge r1028797, r1028799 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

Add a note about LimitRequest* and name-based vhosts as followup on PR#7741

make the name-based vhost note a warning based on offline discussion with Rich

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

Correct context for LimitRequest* as per bug #7741

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

Add mention of mod_log_config and BufferedLogs, as per
https://issues.apache.org/bugzilla/show_bug.cgi?id=50110

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

proxy vote

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

Typo correction.

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

Another NetWare makefile cleanup.

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

Removed now obsolete leftover from IDE build.

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

Propose.

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

New .fr translation for mod_auth_basic

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

Adding french translation for mod_authn_alias documentation

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

RPM spec file: wait up to 10 seconds for httpd to kill child processes.

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

NetWare build tweaks.

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

Adding the french 2.2 translation for the rewrite doc

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

Done and away

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

Update transforms

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

Add warning about using rotatelogs filename formats with not
enough granularity.  PR46318.

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

Stare at cache patches too long, eventually you see double.

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

Propose.

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

Propose.

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

Unsynchronize

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

Someone must have added this using the ancient license practices

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

Additional comment about the role of ServerName

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

Rebuild all with copyright date bump

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

Fixed copyright year.

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

Adding french documentation for mod_proxy_http

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

Added the french translation for this documentation

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

RPM spec file: backport a typo fix, {$ becomes ${.

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

Bump after tag.

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

Prepare for tag

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

Re./build all docs, minimal tag changes for release .17

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

Removing issues.

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

Tag ZLIB_DLL, to slightly optimize the run time symbol resolver.

Trivial backport of r1021529

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

prefork MPM: Run cleanups for final request when process exits gracefully,
in spite of faulty apr_reslist code.

Backports: r943650
PR: 43857
Submitted by: Tom Donovan
Reviewed by: trawick, rjung, wrowe

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

Merge r1021468 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

Caution against using non-regex ProxyPass inside of a <LocationMatch> container.
PR#50048

Submitted By: Luke Meyer
Reviewed By: Eric Covener

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

backport r1005973:
Mention that the required ThreadStackSize depends on the modules loaded.
Instead of recommending a value, recommend not to reduce it unless necessary.

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

The vulnerable code was not in 2.2.16's mod_reqtimeout, therefore we
don't need to mention CVE-2010-1623 in the changelog.

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

SECURITY: CVE-2010-1623 (cve.mitre.org)
Fix a denial of service attack against mod_reqtimeout.
[Stefan Fritsch]

mod_req-timeout/core: Backport bugfixes from trunk up to r935339:
    - Do not wrongly enforce timeouts for mod_proxy's backend
      connections and other protocol handlers (like mod_ftp).
    - Enforce the timeout for AP_MODE_GETLINE.
    - If there is a timeout, shorten the lingering close time from 30 to
      2 seconds (involves a change in the core).

Backports: r921378, r921526, r922407, r923418, r923429, r925986, r928881
           r933341, r933547, r935339, r983116, r984985&view=rev
Submitted by: sf
Reviewed by: wrowe, trawick

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

relatively new mod_reqtimeout needs to get in sync with various trunk fixes

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

Keep eol-style for dsp files "native".
This was the only one with CRLF.

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

Pick up CVE-2010-1623 with this enhancement.  One more pair of eyeballs please?

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

No objection, ready to backport, but a source comment was requested

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

mod_proxy_balancer: Force workers into PROXY_WORKER_IN_ERROR when configured
statuses are found

PR: 48939
Backports: 930125, 930254, 962972, 987359
Submitted by: Daniel Ruggeri <DRuggeri primary.net>
Reviewed by: trawick, niq, wrowe

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

mod_authnz_ldap: If AuthLDAPCharsetConfig is set, also convert the password to UTF-8.

PR: 45318
Backports: r902654
Submitted by: Johannes Mueller <joh_m gmx.de>, sf
Reviewed by: rpluem, wrowe

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

backport r902654 from trunk:

mod_authnz_ldap: If AuthLDAPCharsetConfig is set, also convert the password to
UTF-8.

PR: 45318
Adapted patch from Johannes Mueller

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

backport of r1005529:
Document that a ThreadStackSize of 128K or lower will crash on Linux and
recommend at least 200K

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

Executed

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

ab: repeat apr_pollset_poll() while APR_STATUS_IS_EINTR(rv)

Backports: r750094
Submitted by: trawick
Reviewed by: sf, wrowe

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

Clean up some miscellaneous warnings from Fortify or Intel's compiler
Backports;

 r991516, mod_rewrite.c::cmd_rewritecond(): use enum value instead of
          integer literal
 r991515, util.c::ap_pregsub(): don't needlessly set var
 r991507, scoreboard.c::ap_create_scoreboard(): don't needlessly set var
 r987629+r987631, config.c::ap_build_cont_config(): don't needlessly
                  check var for NULL
 r986901+r987860, core.c::dirsection(): remove dead error check
 r983066, mod_cern_meta.c: remove unexpected ";" after end of block
 r987339, main.c::usage(): don't overlay stack buffer with impossibly
          long argv[0]
 r982050, mpm_unix.c (backported to mpm_common.c): remove unused vars

Author: trawick
Reviewed by: sf, wrowe

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

Go a little faster by eliminating a sscanf() call when parsing response lines.
Backport r999694; AUthor: trawick, reviewed by: sf, wrowe.

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

Rename macro to a better name and sync with trunk.
REviewed by: wrowe, rjung.

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

Added NetWare auto restart script.

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

Update transformations.

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

Add detailed information about how to use
session stickyness.

Mostly backport of r1003131 plus stickyness
with custom cookie example.

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

Add fix for CVE-2010-1623 to mod_reqtimeout proposal

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

Add information about proxy workers to proxy docs.

Mostly a backport of r987858.

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

Vote, promote.

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

Revert unassociated CHANGES entry from r1004734

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

Persuaded, jorton should review this status item commentary

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

Votes and promotions, and already executed one patch with extreme prejudice.

Note intent to roll Thursday

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

This really didn't need a backport vote per say, is already built
for other platforms, and for Windows in trunk.

mod_proxy_scgi: Add module to build on Windows.

Submitted by: rjung
Reviewed by: wrowe

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

This type fix is needed to quiet type mismatch warnings, nelts is also an int

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

RPM init script: Update the htcacheclean init script to take into
account the pid of the running htcacheclean process. This enables
htcacheclean to be enabled more than once to clean multiple caches
on the same machine.

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

propose backport.

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

Spelling errors

PR: 49983, 49967
Submitted by: Chris Matthews <chris bbd co za>,
              Angelo Babudro <tech support donsdirectory com>

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

adjust vote

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

Thanks/sorry, sf!

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

vote and comment

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

missed a couple of transforms

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

bring transformations up to date for others

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

FakeBasicAuth, not FakeBasic

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

Backport trunk revs 826506, 826520, 826528, 987498

sync htdigest with trunk to fix overflows and pick up other minor tweaks

Reviewed by: poirier, rpluem

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

propose

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

Updates.

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

Fix apidoc comments in ap_regex

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

ap_document_root_check must live in libhttpd, not in the httpd binary,
due to the way that symbols are resolved.

Generally, main.c should export nothing.

Backports: r901557 (overlooked when proposed for backport)

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

Propose.

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

* Comment

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

* Vote and promote

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

Vote to backport htdigest overflow fixes

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

has anyone listened to Fat Albert Rotunda lately?  wow!

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

gratuituous request that I don't have to see some silly warnings anymore

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

ab testing

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

compatability text for apachectl -T

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