Merge r1664565 from trunk:

*) mod_rewrite: Add support for starting External Rewriting Programs
   as non-root user on UNIX systems by specifying username and group name
   as third argument of RewriteMap directive.

Submitted by: jkaluza
Reviewed by: jorton, wrowe, ylavic

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

Merge r1808230 from trunk:

* server/protocol.c (ap_content_length_filter): Rewrite the content
  length filter to avoid arbitrary memory consumption for streaming
  responses (e.g. large CGI script output).  Ensures C-L is still
  generated in common cases (static content, small CGI script output),
  but this DOES change behaviour and some responses will end up
  chunked rather than C-L computed.

PR: 61222
Submitted by: jorton, rpluem
Reviewed by: jorton, wrowe, ylavic

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

Merge r1736186 from trunk:

mod_ssl: return non ambiguous value in ssl_callback_SessionTicket() for
encryption mode (we used to return 0, OpenSSL documents returning 1 instead).

Practically this does not change anything since OpenSSL will only check for
>= 0 return value (non error) for encryption mode (the other possible return
values are only relevant for decryption mode).

However the OpenSSL documentation for SSL_CTX_set_tlsext_ticket_key_cb()
states:
"
The return value of the cb function is used by OpenSSL to determine what
further processing will occur. The following return values have meaning:

2
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters. Additionally it indicates that the session
    ticket is in a renewal period and should be replaced. The OpenSSL library
    will call cb again with an enc argument of 1 to set the new ticket (see
    RFC5077 3.3 paragraph 2).

1
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters.

0
    This indicates that it was not possible to set/retrieve a session ticket
    and the SSL/TLS session will continue by by negotiating a set of
    cryptographic parameters or using the alternate SSL/TLS resumption
    mechanism, session ids.
    If called with enc equal to 0 the library will call the cb again to get a
    new set of parameters.

less than 0
    This indicates an error.
"

So 0 is not appropriate in our code, 1 is what we really want (and it won't
break if OpenSSL later changes its checks on the callback return value).

Reported/Proposed by: oknet on github, pull request #18.
Reviewed by: jorton, ylavic, wrowe
[Closes #18]

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

Vote, promote.

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

Upvote, promote

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

This appears wrong... left a duplicate break line here when manually editing

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

Fix Release as well as Debug target, submitted by Ivan Zhakov

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

Vote.

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

1*merged.

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

Merge r1798785 from trunk:

Quiet spurious gcc warning in ap_parse_form_data ("'escaped_char[0]' may be
used uninitialized in this function").

Submitted by: ylavic
Reviewed by: jailletc36, ylavic, jorton

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

mod_ssl SessionTicket callback fixeruper.

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

Merge r1811570 from trunk:

* Make it compatible with Python 3
Submitted by: rpluem

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

Merge r1811569 from trunk:

* The calculation of the sizes was flawed:
  The index tells us the size of the node in 4096 byte pages minus 1.
  Hence we need to multiply back with 4096 aka << 12 (plus adding the
  missing page).

Submitted by: rpluem

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

Merge r1811540, r1811541 from trunk:

* It needs to be the dereferenced node

* Convert to int before using
Submitted by: rpluem

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

Revert r1811557: This should have gone to trunk first

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

* The calculation of the sizes was flawed:
  The index tells us the size of the node in 4096 byte pages minus 1.
  Hence we need to multiply back with 4096 aka << 12 (plus adding the
  missing page).

Reverted in r1811568

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

Add two backport proposals.

wrowe's +1 for C-L filter rewrite per msgid <CACsi252gUT1n_mzgwUVathOwYbidDzET7bTXR_KycobyLBWKAQ@mail.gmail.com>

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

Release date

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

Merge r1811192, r1811285 from trunk:

* Add dump_all_pools and dump_pool_and_childs.

  - dump_all_pools: Dump the whole pool hierarchy starting from apr_global_pool.
                    Requires an arbitrary pool as starting parameter.
  - dump_pool_and_childs: Dump the whole pool hierarchy starting from
                          the given pool.

  dump_pool_and_childs is written in Python using the GDB Python API
  as doing recursive stuff in standard GDB macros is very difficult.

* Take the pointer from Yann: s/childs/children/

Submitted by: rpluem

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

Merge r1808671 from trunk:

* Correctly dump pools that have no tag
Submitted by: rpluem

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

Merge r1666617 from trunk:

.gdbinit: Add dump_skiplist.
Submitted by: ylavic

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

Upvote, although CTR would seem reasonable

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

add missing transformations

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

Note that this seems clang specific

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

Vote.

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

Expat, like PCRE before, is aquired and built independently as of apr 1.6

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

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

Note show-stopper: --enable-maintainer-mode is broken w/ Xcode 9

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

Nevermind, my merge missed r1810089 somehow...

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

Vote, promote.

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

Vote + promote

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

Vote mod_http2 1.10.12

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

Propose

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

fixed embarassing vi artefact

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

On the 2.4.x branch:

mod_http2: propose backport to v1.10.12

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

RFC8081, new font/ registry as pointed out by Steffen (backports r1810121)

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

Repair copy/paste error noted by Steffen

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

We no longer bundle APR at all, I don't know that many of these
licenses belong in *this* project repository.

But APR no longer bundles expat at all, making two of those
licenses very archaic - and note they did not reflect the current
LICENSE file contents of the component.

Opinions on leaving it up to repos/asf/apr/apr/trunk/LICENSE
to document other licenses on their project, since we simply are
a consumer of another component, and no longer bundle that?

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

Duplicate mod_watchdog.h to include/

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

Vote.

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

This source and build file are text

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

This file contains text

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

svn:keywords = LastChangedRevision

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

svn:eol-style = native

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

update transformations

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

Fix proposal in STATUS

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

Propose

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

Propose

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

And we are 2.4.29-dev

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

Get ready to tag 2.4.28

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

Docs xforms

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

Rebuild.

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

XML update.

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

Merge r1802875 from trunk:

event: Avoid possible blocking in the listener thread when shutting down
connections. PR 60956.

start_lingering_close_nonblocking() now puts connections in defer_linger_chain
which is emptied by any worker thread (all atomically) after its usual work,
hence any possibly blocking flush and lingering close run outside the listener.

The listener may create a dedicated worker if it fills defer_linger_chain or
while it's not empty, calling push2worker with a NULL cs.

The state machine in process_socket() is slighly modified to be able to enter
with CONN_STATE_LINGER directly w/o clogging_input_filters to interfer.

New abort_socket_nonblocking() allows to reset connections when nonblocking is
required and we can't do much about the connection anymore, nor we want the
system to linger on its own after close().

Many thanks to Stefan Priebe for his heavy testing on many event's changes!

Submitted by: ylavic
Reviewed by: ylavic, jim, icing

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

vote and promote

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

event changes test OK on 2.4

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

Propose fix for PR 60956.

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

nor corrections.--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    manual/caching.xml.fr

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

propose T&R

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

Merge r1808780 from trunk:

mod_speling/PR 38923: don't embed Referer in link in error page.

Submitted by: niq
Reviewed by: niq, ylavic, elukey

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

Merge r1805188, r1805190, r1805206, r1808723 from trunk:

loadfactor now decimal

Umm. This is C :)

Fix remaining lint from ms capability for hchecks.

format typo

Reviewed by: jim, humbedooh, ylavic

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

Merge r1729235, r1730079, r1801665 from trunk:

Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.

Use different variables to track normal
modules and MPMs during build.

Normal modules and MPMs follow different
rules in the config, e.g. we are only
allowed to have one active LoadModule
for an MPM in the config.

As a side effect, LoadModule for MPMs
will now come before LoadModule for
the normal modules.

Makefile.in: fix MPM_MODULES typo
Submitted by: rjung, jchampion
Reviewed by: jchampion, icing, ylavic

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

Merge r1808008, r1808085 from trunk:

htdigest: prevent buffer overflow when strings in lines are too long.

Reported by: Hanno Böck
PR: 61511

Update CHANGES after r1808008
Submitted by: elukey
Reviewed by: elukey, icing, ylavic

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

Vote + Promote

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

CVE-2017-9798 disclosed, amend CHANGES entry for
https://svn.apache.org/r1807754

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

Vote.

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

propose backport

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

Comment.

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

Vote, promote.

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

Not really a blocker, I just saw too much weirdness with floats ;)
Looks fine here though.

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

it's an older code, but it checks out...

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

lbfactr patch v2

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

Merge r1801594 from trunk:

Add logic to read the Upgrade header and use it in the response.
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142

Submitted by: jfclere
Reviewed by: jfclere, jim, covener

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

prettify.js: update the js with the new Directives

Replaced the old list with what currently found in
https://httpd.apache.org/docs/current/mod/directives.html

This should allow a better highlight of new directives
like the mod_http2's ones

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

vote

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

Proposed backport of r1808008

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

Rebuild.

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

XML updates.

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

No CHANGES entry for a new feature?

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

Merge r1745039 from trunk:

include the scheme in the error message about missing a
mod_proxy_submodule (mod_proxy_$usually_a_scheme)

Submitted by: covener
Reviewed by: jim, ylavic, icing

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

Merge r1799435, r1799437, r1805206, r1805322 from trunk:

Allow WatchdogInterval to be sub 1 second

Allow finer control over hcheck intervals... minimum is whatever
the watchdog slice is.

Fix remaining lint from ms capability for hchecks.

userland change = we now are OK w/ ms

Submitted by: jim
Reviewed by: jim, covener, ylavic

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

Merge r1803420, r1803454, r1804090 from trunk:

mod_http2: version bump, partial fix for stream response getting stuck, see https://github.com/icing/mod_h2/issues/143

mod_http2: signalling produce IO before waiting on beam buffer to drain.

mod_http2: non-dev version for backport

Submitted by: icing
Reviewed/backported by: icing, steffenal, ylavic

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

Merge r1793922, r1793923 from trunk:

Add an Override Class Index

This page pulls in directives that declare an <override> element and
groups them by class. The documentation for each class comes from
overrides.xml. Any undocumented classes are flagged with a boilerplate
fallback text (this situation is only likely to occur with a misspelling
or otherwise invalid <override> somewhere else in the documentation).

override index: clarify this doc's purpose

Based on feedback by elukey.
Submitted by: jchampion
Reviewed by: jchampion, jim, icing

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

Merge r1802845 from trunk:

Make sure updatelbstatus() is NULL

Submitted by: jim
Reviewed by: jim, covener, ylavic

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

Follow up to r1807761: CHANGES entry.

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

Merge r1780441, r1780470, r1795928 from trunk:

buildconf: allow configuration without APR sources

Previously we required copying the APR (and APR-util) source code into
srclib or some other location on disk in order to build httpd directly
from source. This is annoying if you're on a distribution that already
has the required files in its APR dev packages.

Practically speaking, if you're not building an official distribution
tarball, you only need the following files:

1) config.guess
2) config.sub
3) find_apr.m4
4) find_apu.m4
5) PrintPath

1 and 2 come from automake. 3 and 4 are included in some distributions'
(e.g. Debian's) development packages for APR/-util. That leaves
PrintPath, which has not changed meaningfully in over a decade and is
checked in completely here.

Passing an apr-config executable to buildconf's --with-apr option will
now enable a mode in which the above files (minus PrintPath) are copied
from their respective homes, removing the need for APR sources on disk.
Otherwise, if a source tree is passed, the current behavior is retained
and all of the above files are copied from APR directly.

buildconf: add --help for the new behavior

buildconf's behavior is a little complicated (and was made more so with
apr-config mode), so add some self-documentation.

buildconf: check in APR[-util] m4 macros

Suggestion by wrowe. These files haven't changed in years; since we need
them anyway, check them in directly. buildconf will still copy over the
latest versions during setup, and SVN will tell us if there are any
changes.

Submitted by: jchampion
Reviewed by: jchampion, jim, ylavic

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

Merge r1807655 from trunk:

core: Disallow Methods' registration at run time (.htaccess), they may be
used only if registered at init time (httpd.conf).

Calling ap_method_register() in children processes is not the right scope
since it won't be shared for all requests.

Reviewed by: ylavic, covener, icing

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

Merge r1766998 from trunk:

Follow up to r1739201.
These APR_TIMEUP special cases are now handled by ap_map_http_request_error().

Reviewed by: jailletc36, jim, covener

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

Backported.

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

Merge r1803392, r1803396, r1803398 from trunk:

mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP
is defined.  PR 61206.

Submitted by: Michael Schlenker <msc contact.de>

mod_ssl, ab: compatibility with LibreSSL.  PR 61184.

LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with
all of the latest OpenSSL 1.1 API.

Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for
anything but OpenSSL >= 1.1 (for now).

Proposed by: Bernard Spil <brnrd freebsd.org>
Reviewed by: ylavic

Follow up to r1803396: CHANGES entry.

Reviewed by: ylavic, jim, covener

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

vote and promote

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

reverting prev commit with unwanted rev numbers on top dir

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

vote and promote

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

Merge r1784318 from trunk:

 Support use of optional "tag" in syslog entries. Streamline the patch.
 PR 60525.

Submitted by: jim
Reviewed by: rpluem, jim, mrumph

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

Promote.

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

Comment, vote and promote.

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

promote

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

lots of votes

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

EPASTE

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

Propose.

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