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

update feather to conform with styleguide.
https://apache.org/foundation/press/kit/ApacheFoundation_StyleGuide.pdf

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

Add suggestions to PROXY protocol proposal

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

Generated doc changes

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

Rebuild.

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

XML update.

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

Vote and promote

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

Vote and suggest

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

And these backports look, and test, good. +1

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

Rebuil.

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

XML update.

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

Propose

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

lgtm

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

syslog vote

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

format change

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

Merged.

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

Merge 1805099 from trunk:

Fix ProxyAddHeaders merging.

* modules/proxy/mod_proxy.h:
  Add add_forwarded_headers_set field to proxy_dir_conf.

* modules/proxy/mod_proxy.c (create_proxy_dir_config):
  Initialize add_forwarded_headers_set.
  (add_proxy_http_headers): Set it.
  (merge_proxy_dir_config): Merge add_forwarded_headers correctly.

Reviewed by: jorton, rpluem, jim

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

* Vote

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

Tested and voted on proposals... Will try to do LibreSSL this
weekend.

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

2 backport proposals

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

create +1 vote line

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

Merge r1713043, r1802305, r1802309 from trunk:

Save a few bytes in conf pool when processing 'Define'.

+ some minor style issues
+ split long lines

Be explicit and safe (const) with the strings stored in ap_server_config_defines.

Follow up to r1713043.

ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of
*const* strings (must not change after being inserted), make it explicit.

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

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

Merge r1618555 from trunk:

prefork: Ignore SIGINT in child. This fixes race-condition in signals handling
when httpd is runnning on foreground and user hits ctrl+c. In this case, SIGINT
is sent to all children followed by SIGTERM from the main process, which
interrupts the SIGINT handler and leads to inconsistency (process freezes
or crashes).

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

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

Merge r1789220, r1792675 from trunk:

core: Disallow multiple Listen on the same IP:port when listener buckets
are configured (ListenCoresBucketsRatio > 0), consistently with the single
bucket case (default), thus fixing the leak of the corresponding socket
descriptors on graceful restart.

Follow up to r1789220.
Document the implicit behaviour of ListenCoresBucketsRatio when multiple
Listen-ers are configured on the same IP:port.

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

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

promote those w/ 3 +1s

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

Votes

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

* Vote

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

Votes*N, propose*1.

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

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

vote

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

mod_http2: backport proposal added

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

lost backport of log entry improvement

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

Rebuild.

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

XML updates.

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

update transformations.

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

update for sync with English docs.

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

Propose.

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

xforms

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

Merge r1803313 from trunk:

cross link some balancer directives across proxy mods

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

Documentation update: part 2

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

Documentation rebuild

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

mod_proxy*.xml: improve connection reuse documentation

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

extended warning catch

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

Rebuild.

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

XML updates.

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

Withdraw my mod_proxy_fcgi backport proposal

There has been some discussion over IRC about
possible performance issues with the current
code in certain scenarios (like a simple echo
FCGI backend that returns data as it comes in).

Jacob is working on a different solution, waiting
for his feedback before proceeding any further.

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

Propose syslog backport re: PR 60525

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

update xforms

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

Merge r1802336 from trunk:

UDS does support reuse

Reviewed by: jim

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

Agreement between example and explanation

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

Easy proposal.

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

Merge r1762580, r1762701, r1762702, r1762718, r1762723, r1762742, r1762743, r1774538, r1779354 from trunk:

event: use atomics for *timeout_queue->total since it's updated concurrently,
and move TO_QUEUE_*() macros to functions.

event: add/remove from/to the pollset outside of the critical sections.

We don't need external locking since it's created with APR_POLLSET_THREADSAFE,
hence reduce those sections to the lowest cycles possible.

A spinlock may be interesting instead of the mutex now, we won't block and the
TO_QUEUE_*() and process_timeout_queue() operations are fast...

event: follow up to r1762701: update log tag.

event: avoid unnecessary listener/polling wake ups (context switches) by using
apr_pollset_wakeup(), when implemented, to signal the listener according to the
next timers or timeout queues expiry (updated at insert and maintenance time).

Follow up to r1762718: CHANGES entry.

event: follow up to r1762718.
We still need to kill kept-alive connections in normal/expiry processing if
the workers are busy or dying.

event: follow up to r1762718 and r1762742: put de condition where it belongs.

event: follow up to r1762718.

On graceful shutdown/restart, kill kept-alive connections before poll()ing
again, avoiding to wait for their "normal" timers (before being woken up)
when they remain the last handled connections.

event: follow up to r1762701.
Keep QUEUE_APPEND()+pollset_add() or QUEUE_REMOVE()+pollset_remove() atomic.

Otherwise when a worker adds an entry in some queue (e.g. KA, lingering), it
might race with the listener in the time between the mutex is released and the
pollset is updated; meanwhile the listener might process the queue and find an
entry no yet in its pollset.

For the lingering queue, the entry could then have been used after its pool
destroyed.

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

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

Merge r1754164, r1801994, r1801995 from trunk:

mod_proxy_wstunnel: we want to detect whether some response was sent to
the client when forwarding data from the backend to the client, not the
reverse.

Follow up to r1754164: CHANGES entry.

Follow up to r1801994: CHANGES' PR reference.
Submitted by: ylavic
Reviewed by: ylavic, jchampion, jim

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

promotes

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

some votes

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

Note release date for 2.4.27

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

Credits.

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

Add CHANGES' security entries for 2.4.27.

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

Propose backport of r1802040

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

Vote.

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

Propose.

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

Propose.

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

Propose fix for PR 61142

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

Propose.

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

Point to 2.4.28-dev version of patch

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

typo

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

And we are 2.4.28-dev

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

Get ready to tag 2.4.27

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

make COMPATIBILITY entries explicit

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

more meat re: lua compatibility "break"

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

CHANGES: note mod_lua compatibility break

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

Merge r1800978 from trunk:

On the trunk:

mod_http2: Simplify ready queue, less memory and better performance. Update
     mod_http2 version to 1.10.7.

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

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

Vote, promote.

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

vote on http2 backport

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

propose backport

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

Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
comparisons.

Submitted by: wrowe, Robert Święcki <robert swiecki.net>
Backports: r1800917
Reviewed by: wrowe, jim, jchampion

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

SECURITY: CVE-2017-9788: Uninitialized memory reflection in mod_auth_digest.

The value placeholder in [Proxy-]Authorization headers type 'Digest' was not
initialized or reset before or between successive key=value assignments by
mod_auth_digest.  Providing an initial key with no '=' assignment could reflect
the stale value of uninitialized pool memory used by the prior request, leading
to leakage of potentially confidential information, and a segfault.

Submitted by: wrowe
Backports: r1800919
Reviewed by: wrowe, jim, jchampion

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

Vote/promote another.

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

Vote/promote one.

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

vote

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

Two more string parsing oddities for consideration

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

Mark backported patch 1800173 in commit 1800215

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

Merge r1800788 from trunk:

Add mod_proxy_hcheck to generated httpd.spec file.  PR 60506.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim

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

promote

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

vote on rpm change

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

* Vote

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

mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.
PR58188, PR60831, PR61245.

CTR

The following lua 5.2 and 5.3 compat change
should be checked for runtime correctness
by someone more knowledgeable about lua.

Index: modules/lua/lua_apr.c
--- modules/lua/lua_apr.c (original)
+++ modules/lua/lua_apr.c Tue Jul  4 20:48:43 2017
@@ -82,7 +82,11 @@ static const luaL_Reg lua_table_methods[
 int ap_lua_init(lua_State *L, apr_pool_t *p)
 {
     luaL_newmetatable(L, "Apr.Table");
+#if LUA_VERSION_NUM < 502
     luaL_register(L, "apr_table", lua_table_methods);
+#else
+    luaL_newlib(L, lua_table_methods);
+#endif
     lua_pushstring(L, "__index");
     lua_pushstring(L, "get");
     lua_gettable(L, 2);

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