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

Follow up to r1820802: backported.

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

Merge r1818278 from trunk:

APR-ize uint types

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

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

Follow up to r1820800: backported.

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

Merge r1818040 from trunk:

PR61891: looping over mostly full LDAP cache

  *) mod_ldap: Fix a case where a full LDAP cache would continually fail to
     purge old entries and log AH01323. PR61891.

Submitted By: Hendrik Harms <hendrik.harms gmail.com>
Committed By: covener
Reviewed By: covener, jim, ylavic

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

Follow up to r1820798: backported.

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

Merge r1813991 from trunk:

Save a few bytes in the conf pool when handling 'ProxyHTMLDoctype' directive with a user defined  FPI

Submitted by: jailletc36
Reviewed by: jailletc36, niq, jim

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

Follow up to r1820796: backported.

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

Merge r1818804, r1818951, r1818958, r1818960, r1819027, r1819214, r1820035 from trunk:

mpm_event: close connections not reported as handled by any module.

This avoids losing track of them and leaking scoreboard entries.
PR 61551.

mpm_event: follow up to r1818804.

Address corner case where connection is aborted due to ap_run_pre_connection()
failure, and update comment about ap_run_process_connection() expected return
status and state.

mpm_event: follow up to r1818804 and r1818951.

Align comment and fix typos.

mpm_event: follow up to r1818804.

Allow DONE as a successful ap_run_process_connection() return value, for
instance h2_conn_run() and h2_task_process_conn() uses it, third-party
modules may too...

mpm_event: follow up to r1818804 and r1818951.

Be more correct in comment about CONN_STATE_WRITE_COMPLETION.
We currently have/need no state to simply wait for readability on a socket,
so the previous comment was misleading. Write completion can't be used for
a simple "wait for read event and come back to process_connection hooks".

mpm_event: follow up to r1818804 and r1818960.

Align mod_http2 with expected returned state from process_connection hooks in
async MPMs.
When the master connection is handled, enter CONN_STATE_LINGER in any case.

Add missing APLOGNO

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

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

Follow up to r1820794: backported.

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

Merge r1809881, r1809973, r1809976, r1812075 from trunk:

core: deregister all hooks before leaving pconf, otherwise some late cleanup
or function call (e.g. ap_log) may use one while DSOs are unloaded.

See PR 61558 (double/second fault).

core, MPMs unix: follow up to r1809881.

Deregister all hooks first (in pre_cleanup), by doing it last we could still
have had them run when DSOs were unloaded.

Likewise, avoid double faults when handling fatal signals by restoring the
default handler before pconf is cleared (we can't ap_log_error there).

Finally, we need to ignore sig_term/restart (do nothing) when the main
process is exiting (i.e. ap_pglobal is destroyed), since retained_data are
freed.

Aimed to fix all faults in PR 61558.

MPMs unix: follow up to r1809881 and r1809973.

unset_signals() is called when ap_pglobal is destroyed too.

Follow up to r1809881: CHANGES entry.

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

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

vote/promote

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

mod_md is backported in this branch.

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

mod_md  maxsize was less than the resulting image size

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

documentation rebuild

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

event.xml: follow up r1820466 with Yann's suggestions

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

mpm_event's doc rebuild

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

event.xml: add a note about lingering close

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

Sync with 2.4.x.

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

On the 2.4.x-mod_md branch:

merged mod_md relevant parts of 1818030,1818120,1818308,1818725,1818792,1818849,1819799,1819854,1819943,1820036,1820310,1820312 from trunk

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

Update proposal with correct APLOGNO (thanks Christophe!).

No need to reset Stefan\'s vote I guess...

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

Rebuild.

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

XML updates.

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

happy new year's documentation rebuild

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

Happy New Year 2018

Backport of r1820101 from trunk plus year
update in docs/manual/style/xsl/common.xsl.

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

update after backport

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

On the 2.4.x branch:

merge of 1804530,1804531,1805186,1806939,1807232,1808122 from trunk.

Backport of mod_md support in mod_ssl.

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

Small comment

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

Comment.

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

vote

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

Vote, promote.

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

Merge r1819907 from trunk:

Fix upgrading examples

 - providers are case sensitive
 - description didn't match example / 2.2 didn't match 2.4.

Submitted by: Hank Ibell
Committed by: covener

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

update transformation

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

And promote

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

backport votes

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

Propose backport for PR 61551.

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

Backport mod_proxy_html doctype fixes.
PR#56457 included.

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

Votes

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

vote + promote

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

tiny formatting/readability tweak in example

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

backport votes

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

backported

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

Merge r1814968 from trunk:

core: silently ignore a not existent file path when IncludeOptional
     is used.

In https://bz.apache.org/bugzilla/show_bug.cgi?id=57585 some use cases
were reported in which IncludeOptional seems to be too strict in its
sanity checks.

This change is a proposal to relax IncludeOptional checks to silently
fail when a file path is not existent rather than returning SyntaxError.

Submitted by: elukey
Reviewed by: elukey, jim, niq

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

Merge r1809273, r1814719 from trunk:

event: better apr_pollset_add() failure handling to avoid an (very unlikely)
worker vs listener race condition.

Follow up to r1809273: CHANGES entry.

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

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

rebuild

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

Make this example actually work.

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

On the 2.4.x-mod_md branch:

Merged /httpd/httpd/trunk:r1818308,1818725,1818792,1818849

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

rebuild

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

Define delimiter, as per a complaint in the comments

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

Merge r1818701 from trunk:

clarify/reword RegisterHTTPMethod and add some seealso's

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

uwsgi updates

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

Other proposals related to mod_proxy_html

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

Fix missing reference in 'svn merge ...' command line.
Suggest other commits for this backport

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

withdrawl proposal of blocking confusing non-global DEFINE

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

initial vote
:

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

vote/promote the low hanging fruit

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