Merge r683280 from trunk:

* modules/ssl/ssl_engine_io.c (char_buffer_read): Use memmove in place
  of memcpy since the buffers can overlap; add explanatory comment.

PR: 45444

Submitted by: jorton
Reviewed/backported by: jim

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

Merge r978903 from trunk:

Merge mod_dir fixups to avoid possible ordering issues noted by trawick

Submitted by: niq
Reviewed/backported by: jim

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

And flow up

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

Vote on some patches

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

vote+promote

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

add proposal

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

Now with a rebuild-all

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

Seems this hadn't been rebuild in a bit

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

Reflect new feature introduction, do not neglect compatibility tags(\!\!\!)

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

Add proposal.

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

Fix svn property.

File in trunk is fine, rest of docs also.

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

Update description of HTMLTable

PR: 49676

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

I'd really rather not encourage people to use * in NameVirtualHost.

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

Vote and promote

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

* Vote

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

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@979184 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@979183 13f79535-47bb-0310-9956-ffa450edef68

Propose backport

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

The added path is canceled out by the next one,
but without it the sequence doesn't apply cleanly.

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

Fix typo.

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

add proposal (this bug has caused quite some problems in Ubuntu 10.4)

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

Removed compiler switch -relax_pointers since no longer needed.

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

fix revision in proposal

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

Roll on to 2.2.17-dev

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

Prepare for 2.2.16 release

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

CVE-2010-1452: Fix handling of missing path segments in the parsed URI structure.

If a specially crafted request was sent, it is possible to crash mod_dav or
mod_cache, as they accessed a field that is set to NULL by the URI parser,
assuming that it always put in a valid string.

PR: 49246
Submitted by: Mark Drayton
Patch by: Jeff Trawick

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

Run filter "init" functions exactly once per request.  No longer run
init functions for connection filters (doing an "init" once per
handler invocation makes no sense for a connection filter).  No longer
run init functions multiple times per request if a subrequest is used.

* include/util_filter.h (ap_filter_rec_t): Clarify use of the init
  function pointer.

* server/config.c (invoke_filter_init): Drop ap_ prefix for private
  function; take a request_rec pointer and only invoke filters with
  matching request.
  (ap_invoke_handler): Adjust accordingly.

PR: 49328
Reviewed by: rpluem

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

Vote late, vote quickly.

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

Unite divided backport proposal.

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

Propose backport.
This one-line patch fixes a bug introduced since 2.2.15,
so it would be a particularly good idea to backport before $next-release.

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

* STATUS: simple config change to help out IE6 users on SSL.

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

veto change to ap_rgetline_core(); should be reverted on truck as well

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

Another backport proposal

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

backport proposal

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

Replace "back-slash" with "backslash" in docs.

I kept "back slash" when explicitely used in
comparison with "forward slash".

Backport of r965792 from trunk.

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

Fix typo in rewrite docs (slash -> backslash).

Thanks to Denis Howe for the hint.

PR49620.

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

backport proposal

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

Propose backport

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

what's in a name?

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

Merge r960233 from trunk:

mod_rewrite: Allow to set environment variables without
explicitely giving a value.

Before this patch using [ENV=VAR] instead of [ENV=VAR:VAL]
silently drops the flag (it is added to the list of vars to set,
but then never actually set).

Submitted by: rjung
Reviewed by: rjung, niq, rpluem

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

* Vote and promote

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

slowdown

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

Note release date for 2.2.15

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

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

xform update (and mod_filter.xml 'no </section>' bug fixed)

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

*) mod_filter: enable filtering of errordocuments.  PR 48377

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

  * Introduce SSLFIPS directive to support OpenSSL FIPS_mode; permits all
      builds of mod_ssl to use 'SSLFIPS off' for portability, but the proper
          build of openssl is required for 'SSLFIPS on'.
              PR: 46270  [Dr Stephen Henson <steve openssl.org>, William Rowe]
                  Trunk patch: http://svn.apache.org/viewvc?rev=925980&view=rev
                                   http://svn.apache.org/viewvc?rev=926000&view=rev
                                                    http://svn.apache.org/viewvc?rev=926614&view=rev
                                                                     http://svn.apache.org/viewvc?rev=926619&view=rev
                                                                         2.2.x patch: http://people.apache.org/~wrowe/ssl-fips-2.2.patch
                                                                             +1: wrowe
                                                                                 minfrin: Doesn't build on v2.2 until you add r926614. With r926614, +1.
                                                                                     wrowe: Added both of rpluem's proposed patched, 926614 and 926619
                                                                                         +1: drh, rjung, jim
                                                                                             rjung: We should add a note about the first version providing this
                                                                                                        option in the docs page, like e.g. we did for SSLInsecureRenegotiation.
                                                                                                            wrowe asks; you mean <Compatibility> tag?  Yes, of course.

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

  * support/htcacheclean: Teach it how to write a pid file (modelled on
      httpd's writing of a pid file) so that it becomes possible to run
          more than one instance of htcacheclean on the same machine.
              Trunk patch: http://svn.apache.org/viewvc?rev=910705&view=rev
                               http://svn.apache.org/viewvc?rev=910735&view=rev
                                                http://svn.apache.org/viewvc?rev=910756&view=rev
                                                                 http://svn.apache.org/viewvc?rev=917002&view=rev
                                                                                  http://svn.apache.org/viewvc?rev=917005&view=rev
                                                                                      2.2.x patch: http://people.apache.org/~minfrin/htcacheclean-pid.patch
                                                                                          +1: minfrin, sf, trawick, jim

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

update

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

cast some votes

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

* Add proposal

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

* Add proposal

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

Merge r785457 from trunk:

Fix bug in r785425 (dereference null pointer when not configured)
and add a couple of comments.

Submitted by: niq
Reviewed by: rpluem, niq, rjung

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

* Promote

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

Vote.

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

vote

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

* Add proposal

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

Merge r955966 from trunk:

* Ensure that we only return a non fatal error if the request is idempotent
  and if we did not sent any request body so far.

Submitted by: rpluem
Reviewed by: rpluem, trawick, niq

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

* Remove stray '"' that was introduced in r962991 by accident and caused
  the compiler to fail.

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

backport r951235 and r951237 from trunk:

  *) mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
     title page only) when any mod_ldap directives were used in VirtualHost
     context.  [Eric Covener]

Reviewed By: covener, wrowe, trawick

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

mod_proxy: Tone down a warning message that appears when the same backend
website is reverse proxied two or more times into the frontend URL space.
PR: 48947
minfrin's patch

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

Improve misleading error message.
PR 38322

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

Backport FallbackResource directive.

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

vote, comment, query

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

vote, promote

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

vote

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

Undo accidental commit of code in r960674

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

Yet another backport proposal

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

Backport proposal for enhancement PR 48377

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

Propose trivial fix (sometimes CTR would be good ...)

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

Add backport proposal.

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

This is claimed

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

* Add proposal

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

add more info to the entry for r527105 from the analogous entry
in trunk's CHANGES

(mod_ldap: Remove the hardcoded size limit parameter for ldap_search_ext
...)

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

This should wrap up our documentation

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

Merge r953377,r953385,r953418 from trunk:

mod_proxy_http, mod_proxy_ajp, mod_reqtimeout:
Use APR_STATUS_IS_TIMEUP instead of direct compare
to APR_TIMEUP to be more safe on different platforms.

Note: This commit has an additional, platform-independent change to
mod_proxy_http.c to mark the back-end connection for closing
("backend->close = 1;").  That code is not required to resolve
CVE-2010-2068 on any platform.

PR: 49417
Addresses CVE-2010-2068 (changes to mod_proxy_http.c)
Submitted by: rjung, rpluem
Reviewed by: rjung, rpluem, wrowe

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

Promote.

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

* Vote

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

Some votes and comments; mod_cache review is this weekend's project

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

Propose.

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

Propose.

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

Fix typo.

PR: 49357
Submitted by: Matt Selsky <selsky columbia edu>

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

propose mod_ldap cache bug

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

Propose.

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

Fix typo

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

hold up on prefork change that works around reslist issue
(and may hide other issues)

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

promote

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

vote

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

backport 946616 and 946617 from trunk:
  PR49308: Header directive doesn't see CGI-issued headers because they live in err_headers.
  emphasize request/response in the timing description, easy to miss the significance

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

Daniel Ruggeri asked that we consider inclusion of the PR 48939
fix in 2.2.x, and he did so in the form of a patch to 2.2.x/STATUS.

Submitted by: Daniel Ruggeri <DRuggeri primary.net>

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

Reviewed & backported.

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

Merge r417988 from trunk:

* modules/ssl/ssl_engine_init.c (ssl_init_ctx_cleanup_proxy): Unset
pkp->certs pointer after freeing the array; fixes segfault at startup
if the certs are shared across >1 server_rec.

PR: 39915
Submitted by: jorton
Reviewed by: minfrin, rjung, jorton

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

fix broken patch

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

Promote.

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

Vote, comment.

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

fix trunk revision to point to proper prefork MPM run-cleanups fix

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

vote/promote htcacheclean enhancement
need to look at sf's entries more

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

propose

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

propose

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

propose

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