v3 of RemoteIPProxyProtocol.2.4 accepted.

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

Propose.

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

Vote, and note we need an extra backport.

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

mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
allowing per backend TLS configuration.
trunk patch: http://svn.apache.org/r1740928
             http://svn.apache.org/r1740960
             http://svn.apache.org/r1740967
             http://svn.apache.org/r1740987
             http://svn.apache.org/r1740998
             http://svn.apache.org/r1742697
             http://svn.apache.org/r1756976
             http://svn.apache.org/r1781313
             http://svn.apache.org/r1812193
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4.x-r1740928_and_co-v6.patch
+1: ylavic, icing, minfrin

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

Vote, promote.

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

mod_proxy_uwsgi: Add in UWSGI proxy (sub)module
trunk patch: http://svn.apache.org/r1810358
             http://svn.apache.org/r1810362
             http://svn.apache.org/r1810363
             http://svn.apache.org/r1810365
             http://svn.apache.org/r1810447
             http://svn.apache.org/r1816919
             http://svn.apache.org/r1816922
             http://svn.apache.org/r1818013
             http://svn.apache.org/r1818280
+1: jim, icing, minfrin
icing: tested on ubuntu 16.04 with a simple uwsgi python app.

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

Vote, promote.

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

Backported.

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

Merge r1822509, r1822511, r1823412, r1823415, r1823416, r1823564, r1823572, r1823575 from trunk:

mod_slotmem_shm: Rework SHM reuse/deletion.

To fix races with graceful restarts (PR 62044).

This commit does:
1/ use a constant file name for all systems (no generation suffix which
   makes a new SHM to be created for each restart, losing previous data)
2/ maintain the list of the created SHMs accross restarts (ap_pglobal list)
3/ not unlink the files on restart anymore (otherwise we can't reuse them)
4/ not attach existing SHMs in slotmem_create() anymore (not suitable since
   those are necessarily crash remainders)
5/ add type/sizes consistency check for persisted slots on restoration
6/ unlink the files only on stop/exit or before creating them (crash recovery)

We could possibly avoid 6/ (since we don't need to re-open files now) if we
remove the file just after the SHM is created.  This would at least work for
systems with "unlink semantic" (i.e. unlink succeeds even if some descriptors
are opened, the "real" thing happening when the last one desciptor closed), but
this wouldn't work for other systems so I kept the code generic for now.

mod_slotmem_shm: follow up tp r1822509.

Please buildbot (and incidentally users of older APR) by using
apr_shm_remove() instead of the new(er) apr_shm_delete().

mod_slotmem_shm: follow up tp r1822509.

Check SHM sizes when reused, reload may have changed the needs.

mod_slotmem_shm: follow up tp r1822509.

Do not bind attached slotmems to the global list, they should be detached with
the given pool (pchild) is cleaned up, but not destroyed/removed (doubly) with
pglobal.

mod_slotmem_shm: follow up tp r1822509.

Complete layout of SHM and persited file (ascii art).
Simplify an "if" condition, no functional change.

mod_proxy_balancer: follow up tp r1822509.

Rework server_rec ID so that it doesn't change on restart (or stop/start)
unless it's Host(s)/IP(s):port(s), ServerName and/or ServerAlias(es) changed.

The goal being to reuse SHMs (and persisted files) names as much as possible,
with minimal bindings to configuration changes (as far as mod_proxy_balancer
is concerned). So if the ServerName and first Host/IP:port are unique we use
that first, otherwise the ServerAlias(es) and other Host(s)/IP(s):port(s) are
also taken into account, and finally if that's still not enough the server
index is also used (pathological case handled for correctness with regard to
the underlying mod_slotmem_shm's reuse code).

mod_slotmem_shm: follow up tp r1822509.

Fishy "unlink semantic" (description) does not apply anymore.

Follow up to r1822509: amend CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, jim, minfrin

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

Vote and promote.

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

Vote.

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

Vote.

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

rebuild

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

Fixes quoting as per https://bz.apache.org/bugzilla/show_bug.cgi?id=62063
Credit: Hendrik Harms <hendrik.harms@gmail.com>

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

documentation rebuild

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

mod_proxy_fcgi.xml: add more context to the conn reuse note

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

Rebuild.

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

XML updates.

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

On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1821371,1822502-1822503,1822624

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

promote

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

Propose

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

Rebuilt

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

Add missing idtype="section"

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

rebuild

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

Fix a broken link + fix some layout to synch with trunk

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

documentation rebuild

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

mod_proxy_fcgi.xml: add a note about connection reuse

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

backport prop vote

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

Merge r1821558, r1821561, r1821595 from trunk:

mod_event: Let the listener thread do its maintenance job on resources shortage.

PR 61979.

Follow up to r1821558: CHANGES typo.

mpm_event: Follow up to r1821558.

Don't crash (in listener) if we can't create the ptrans allocator.

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

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

Merge r1819855, r1821562 from trunk:

mpm_event: wakeup the listener to re-enable listening sockets.

When listening sockets are disabled (too many connections) and the number of
workers / active connections comes back below the limit, we need to wake up
the listener to re-enable them.

Add a new connections_above_limit() helper to determine when this applies.

Follow up to r1819855: CHANGES entry.

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

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

Merge r1643279, r1703241, r1802535, r1819847, r1819848, r1819852, r1819853 from trunk:

mpm_event(opt): avoid casts/comparisons from unsigned to signed (atomics).

mpm_event/worker: make ap_queue_term() atomic (acquire/release the mutex once).

mpm_event: ap_queue_info_try_get_idler() may atomically decrement and then
re-increment the number idlers if it went under or to zero.  We can avoid
this by switching to a compare-and-swap scheme.

mpm_event: avoid unexpected compiler optimizations.

Make sure the compiler doesn't play games with our synchronization variables
by marking them volatile.

mpm_event: make sure wakeup_listener() does its minimal job.

Even if the listener thread is not created yet (i.e. about to be), we must
still tell it to leave, and terminate the worker queue in any case.

mpm_event: worker factor vs pollset.

Make sure the worker factor is at least one (w.r.t. WORKER_FACTOR_SCALE), and
use it to size the pollset appropriately (including K-A and lingering close
connections), in addition to the listening sockets.

mpm_event: remove atomics for timeout_queue's total counter.

It's always updated under the timeout_mutex lock, or read for logging and
scoreboard updates (not critical).

For the read cases a volatile access is enough, while removing the atomic ops
for the already protected write cases saves cycles and context switches.

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

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

Merge r1605328, r1629576 from trunk:

event: minify local variables scope.

event: have_idle_worker must not be cleared in every listener_thread iteration.
Fixes bug when workers were not stopped after graceful restart (introduced in
                                                                r1605328).

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

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

Revert r1823629 to stage backport commits too.

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

promote

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

vote

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

On the 2.4.x branch:

Merge of r1823179 from trunk.

config.layout: Add Fedora layout.

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

merged

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

On the 2.4.x branch:

Merge of r1605328,r1629576,r1643279,r1703241,r1802535,r1819847,r1819848,r1819852,r1819853,r1819855,r1821562,r1821558,r1821561,r1821595 from trunk

  *) event: staging changes (incremental patches) to sync 2.4.x with trunk.

[Reverted by r1823636]

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

promote

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

vote and promote

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

Merged x3.

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

Merge r1556473 from trunk:

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCompression): Fail if
  enabled *and* if OpenSSL does not make any compression methods
  available.  Tweak wording for failure without SSL_OP_NO_COMPRESSION.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

Merge r1816534 from trunk:

* support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of the
  ab link line, not the start.

[too boring for CHANGES]

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

Merge r1822305 from trunk:

* modules/lua/config.m4: Link mod_lua against -lcrypt if available,
  since mk_password_hash() can use crypt().

[too boring for CHANGES]

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

Votes, comment

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

votes on backprops

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

Propose.

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

Backport request... long schemes and hostnames

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

Rebuild

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

Correct LDAP attribute quoting. Patch from hendrik.harms@gmail.com

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

Merge r1723522 from trunk:

* mod_log_debug docs: Fix the IS_SUBREQ example

Submitted by: jkaluza
Reviewed by: jorton

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

mod_ssl tweak.

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

Trio of minor build system tweaks.

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

On the 2.4.x branch:

mod_md: merged copyright de-advertisements.

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

propose

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

maybe do a T&R soon??

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

Rebuild.

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

XML update.

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

+ r1821595 to event patch 4/4.

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

Better event *merge* staging.

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

Propose event update (incremental).

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

Follow up to r1821517: backported.

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

Merge r1821504, r1821505 from trunk:

mpm_{event,worker}: Mask signals for threads created by modules in child init.

PR 62009, so that they don't receive (implicitely) the ones meant for the MPM.

Inspired by: Armin Abfalterer <a.abfalterer gmail.com>

Follow up to r1821504: same comment in event than in worker.

Proposed by: ylavic
Reviewed by: ylavic, icing, covener

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

vote/promote

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

vote

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

Propose.

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

update transformations.

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

update for sync with English docs.

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

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

vote

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

backport r1821195 from trunk and add util_debug.c to libhttpd.mak
http://mail-archives.apache.org/mod_mbox/httpd-dev/201801.mbox/%3C4C412873-869D-4A0C-89E6-397706EFA1F7@apachelounge.com%3E

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

question... is this a "blocker"?

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

docs: update the prettify.js files with new directives

Procedure that I've used:

1) Copy https://httpd.apache.org/docs/2.4/mod/directives.html
   to a text file.
2) Generate a csv with something like
   cat /tmp/trunk_directives | sort | tr "\n" ","
3) Replace the content of CONFIG_KEYWORDS in prettify.js
   with the list generated in 2)
4) Run the command the MINIFY command to generate prettify.min.js

This change should bring out highlight up to speed with the
recent docs (like mod_md's).

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

Documentation rebuild: welcome mod_md to 2.4.x

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

On the 2.4.x branch:

Merge of r1821095 from trunk.

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

2.4.x STATUS update after backport

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

On the 2.4.x branch:

 Merged /httpd/httpd/branches/2.4.x-mod_md:r1816423-1821089
   Merged /httpd/httpd/trunk:r1804530-1804531,1804542,1804545,1804671,1804759,1804787,1804975,1805180,1805192,1805194,1805256,1805294,1805373,1806939,1807228,1807347,1807577,1807593,1807774,1807777,1808005,1808092,1808100,1808241-1808243,1808249,1808444,1809719,1809888,1810723,1811082,1811812,1812193,1812517-1812518,1812999,1813642,1814720,1814939,1815005,1815078,1815264,1815370,1815483,1816055,1816154,1816156,1816552,1816558,1816970,1817023,1817777,1817785,1818120,1818122,1818308,1818725,1818792,1818849

Merged mod_md from trunk via 2.4.x-mod_md branch.

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

We track merges at the root only.

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

We track merges at the root only.

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

Follow up to r1821073: backported.

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

Merge r1599012, r1601559, r1818624, r1819969, r1819970 from trunk:

mod_proxy_html: skip documents < 4 bytes
PR 56286
Micha Lenk

follow up r1599012:
C99 fix

Fix some style

mod_proxy_html: follow up to r1599012.

To determine whether or not HTML data are lower than 4 bytes, use a retain
buffer rather than assuming that all should be contained in a single bucket
with the next one being EOS (if any).

mod_proxy_html: don't depend on NUL terminated bucket data.

ap_regexec() wants NUL terminated strings, so use ap_regexec_len() instead.

Submitted by: niq, takashi, jailletc36, ylavic, ylavic
Reviewed by: jim, ylavic, icing

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

Follow up to r1821071: backported.

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

Merge r1809302, r1809303, r1809305, r1809311, r1809314, r1809713 from trunk:

config: allow to specify flags when registering modules.

First one is AP_MODULE_FLAG_ALWAYS_MERGE.

mod_ssl: follow up to r1809302.

Make use of AP_MODULE_FLAG_ALWAYS_MERGE.

config: follow up to r1809302.
We need to check that the module itself is at the right version.

config: follow up to r1809302.

Provide a convenient function to get module flags, and remove useless
AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN.

config: follow up to r1809302.
Associate ap_get_module_flags() to MMN bump.

On the trunk:

mod_ssl: make the new module flag used.

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

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

Follow up to r1821068 and r1821069: backported.

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

Merge r1802618, r1820808 from trunk:

core, mpm_event: Add ap_update_sb_handle() to avoid a small memory leak of
sizeof(ap_sb_handle_t) when re-entering event's process_socket().

Follow up to r1802618: CHANGES entry.

Proposed by: ylavic
Reviewed by: ylavic, icing, jim

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

Merge r1740910, r1741277, r1820809 from trunk:

event: update worker score keepalive status.

Correct regressions introduced in r1137358 and r1740910.

The conn_rec context may be passed only when setting up the
initial connection, otherwise the request info is trashed.

Follow up to r1740910: CHANGES entry.

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

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

Promote (my + Steffen's vote according to dev@).

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

Rebuild.

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

XML update.

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

vote/promote modflags thing

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

promote "2" backports

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

vote...

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

With these changes, looks like we have enuff votes

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

Reset vote mod_md

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

mod_md vote

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

Vote mod_md SSL only hosts not usable

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

2.4.x votes

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

Note about how to separate the two changes for the real backport(s).

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

Fix revision nums.

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

Follow up to r1820810.

Join the previous proposal with another one (leak fix), not really
related but code conflicts...

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

Propose.

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