Propose small ./configure bandaids

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

Follow up to r1824974: add mergeinfo.

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

Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch]
and correct LICENSE/NOTICE to match.

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

backport vote

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

Documentation rebuild

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

mod_ssl.xml: remove <override>Not applicable</override>

These tags generate a "Not applicable" section in
docs/manual/mod/overrides.html that doesn't make a lot of
sense, plus it breaks ./build.sh validate-xhtml.

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

* Have a veto here. Sorry

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

Note that 2.4.30 will not be released

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

Add missing end tag

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

Propose

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

Backported in r1824879.

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

Merge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862, r1824877 from trunk:

mpm_event: move lingering close "sucker" from the listener to worker(s).

This was the last non-constant time action performed by the listener thread.

It's now handled by the worker thread directly after entering lingering close,
which should directly address the cases when the socket is already closed
remotely at that time, hence avoid more scheduling (it may be the common case
for some scenarios).

And it's only if the above would need blocking (i.e. more data to suck) that
the socket is added to the pollset for the listener to re-schedule a worker
later when ready. If no worker is available at that time then the socket is
forcibly closed (similarly to what's done for keepalive connections in this
case).

Also, since process_lingering_close() is now called by a worker thread and
with almost no depth in the call stack, we can grow the size of the "suck"
buffer from 2K to 32K to potentially call recv() up to sixteen times less.

mpm_event: follow up to r1823047.

Update clogged counter on read_request retry too.

mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).

mpm_event: follow up to r1823047: complete state validation after processing.

mpm_event: follow up to r1823047: CHANGES entry.

mpm_event: follow up to r1823047 and r1824464.

MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid
states returned process_connection (never have been).

mpm_event: follow up to r1823047 and r1824862.

Revert (broken) functional change from r1824862.

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

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

Revert r1824868 (and r1824869).

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

Backported in r1824872.

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

Merge r1824811 from trunk:

10 years after r567503 , fix this properly.

The lock is created in post_config, so we can't copy it
around in a merge_server_config() callback.

Submitted by: covener
Reviewed by: covener, rpluem, jim

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

On the 2.4.x branch:

Merged r1820464 from trunk.

elukey: mod_md update to current certifcate agreement URL.

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

Backported in r1824868.

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

Merge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862 from trunk:

mpm_event: move lingering close "sucker" from the listener to worker(s).

This was the last non-constant time action performed by the listener thread.

It's now handled by the worker thread directly after entering lingering close,
which should directly address the cases when the socket is already closed
remotely at that time, hence avoid more scheduling (it may be the common case
for some scenarios).

And it's only if the above would need blocking (i.e. more data to suck) that
the socket is added to the pollset for the listener to re-schedule a worker
later when ready. If no worker is available at that time then the socket is
forcibly closed (similarly to what's done for keepalive connections in this
case).

Also, since process_lingering_close() is now called by a worker thread and
with almost no depth in the call stack, we can grow the size of the "suck"
buffer from 2K to 32K to potentially call recv() up to sixteen times less.

mpm_event: follow up to r1823047.

Update clogged counter on read_request retry too.

mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).

mpm_event: follow up to r1823047: complete state validation after processing.

mpm_event: follow up to r1823047: CHANGES entry.

mpm_event: follow up to r1823047 and r1824464.

MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid
states returned process_connection (never have been).

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

[Reverted by r1824874]

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

Backported in r1824866.

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

Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:

Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.

mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.

mpm_fdqueue: follow up to r1821624.

Opacify fdqueue types.

mpm_fdqueue: follow up to r1821624.

Style, no functional change.

mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().

mpm_fdqueue: follow up to r1821624.

Clear recycled_pools_count in ap_free_idle_pools().

mpm_fdqueue: follow up to r1821624.

Prepare mpm_worker to use common fdqueue.

mpm_worker: follow up to r1821624.

Use common [mpm_]fdqueue.

mpm_fdqueue: follow up to r1821624.

The implemention wants APR_HAS_THREADS too.

mpm_fdqueue: follow up to r1821624.

The code is not part of the API.

mpm_fdqueue: follow up to r1821624.

Fix typo in comment.

mpm_fdqueue: follow up to r1821624.

Cosmetics, 80 cols, no functional change.

mpm_worker: follow up to r1821624.

Free idle pools while stopping.

mpm_fdqueue: follow up to r1821624.

Be explicit in the naming about what's push/pop-ed.

mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.

mpm_fdqueue: follow up to r1821624.

Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().

mpm_fdqueue: follow up to r1821624.

Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).

mpm_fdqueue: follow up to r1821624.

80 colums.

Follow up to r1821624: CHANGES entry.

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

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

Follow up to r1821624: sync with latest 2.4.x.

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

Promote.

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

Backport vote

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

* Vote

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

mod_proxy_uwsgi Win32 builds
IDE Add project to workspace/solution.
Add the missing pieces for command line build and connect the dots

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

Follow up r1824709 for command line build which is not in trunk

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

Suggest ways to install on common platforms

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

LDAP cache fix

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

Backport votes... not promoting those with 3 in case we
decide to do another T&R for 2.4.31 to correct some
process flaws/inconsistencies

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

And any changes will be in 2.4.31

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

Fluff from 2.4.30 tagging...

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

Post 2.4.30 tag updates

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

add mod_proxy_uwsgi.so to windows build

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

reverting current backport proposal for SSLPolicy

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

backport r1821581 fixes to mod_remoteip.dsp

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

Update proposal.

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

apr-util v1.6 has been released.

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

Update proposal with fix for rpluem/jorton.

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

Vote.

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

Update comment.

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

More comment.

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

Comment.

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

Comment.

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

Rebuild.

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

XML updates.

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

fixed patch for sslpolicy

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

Clarification about MMN bump not needed.

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

Backported in r1824504.

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

Merge r1824176, r1824460, r1824482 from trunk:

mod_proxy: Provide an RFC1035 compliant version of the hostname in the
proxy_worker_shared structure. PR62085

Tone down the message that worker hostname is too long noting it only
affects legacy modules not yet using hostname_ex.

Set the notice when hostname is too long for legacy proxy modules to info level.

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

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

Follow up to r1821624: sync with 2.4.x.

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

Clarify merge note.

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

Propose.

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

Vote.

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

Vote (and note)

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

Vote, promote.

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

Update mergeinfo for r1463049,1492395,1493257,1494532 merged in r1824481.

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

Update proposal.

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

   *) mod_auth_digest: Fix nonce generation.  PR 54637
      trunk patch: http://svn.apache.org/r1463049
                   http://svn.apache.org/r1492395
                   http://svn.apache.org/r1493257
                   http://svn.apache.org/r1494532
      2.4.x patch: http://people.apache.org/~jorton/mad_pr54637.diff
      +1: jorton, ylavic, minfrin

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

Vote, promote.

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

  *) mod_session: Strip Session header when SessionEnv is on.
     trunk patch: http://svn.apache.org/r1824390
     2.4.x patch: trunk works (modulo CHANGES)
     +1: ylavic, rpluem, minfrin

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

Vote and promote.

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

  *) mod_cache_socache: Fix caching of empty headers up to carriage return.
     trunk patch: http://svn.apache.org/r1824343
     2.4.x patch: trunk works (modulo CHANGES)
     +1: ylavic, rpluem, minfrin

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

Vote and promote.

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

Vote.

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

  *) regex: Allow to configure global/default options for regexes, like
     caseless matching or extended format.
     trunk patch: http://svn.apache.org/r1824339
                  http://svn.apache.org/r1824439
     +1: ylavic, rpluem, minfrin

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

Vote and promote (with mmn bump)

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

core: For consistency, ensure that read lines are NUL terminated on any
error, not only on buffer full.
trunk patch: http://svn.apache.org/r1824303
+1: ylavic, rpluem, minfrin

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

Vote and promote.

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

propose sslpolicy backport

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

Propose PR 54637 backport.

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

Update proposal.

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

mod_authnz_ldap: Fix language long names detection as short name.
trunk patch: http://svn.apache.org/r1824336
+1: ylavic, elukey, rpluem

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

proxy_util: Schemes and hostnames that are "too long" are
no longer automatically fatal errors but are instead logged
and truncated, at which point the admin can determine if that
is OK or not.
trunk patch: http://svn.apache.org/r1823482
+1: jim, minfrin, rpluem

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

Update proposal with s/strcasecmp/ap_cstr_casecmp/ as suggested by Ruediger.

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

* Vote, promote, comment

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

vote

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

Fix duplicated proposal.

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

New proposals.

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

Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:

Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.

mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.

mpm_fdqueue: follow up to r1821624.

Opacify fdqueue types.

mpm_fdqueue: follow up to r1821624.

Style, no functional change.

mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().

mpm_fdqueue: follow up to r1821624.

Clear recycled_pools_count in ap_free_idle_pools().

mpm_fdqueue: follow up to r1821624.

Prepare mpm_worker to use common fdqueue.

mpm_worker: follow up to r1821624.

Use common [mpm_]fdqueue.

mpm_fdqueue: follow up to r1821624.

The implemention wants APR_HAS_THREADS too.

mpm_fdqueue: follow up to r1821624.

The code is not part of the API.

mpm_fdqueue: follow up to r1821624.

Fix typo in comment.

mpm_fdqueue: follow up to r1821624.

Cosmetics, 80 cols, no functional change.

mpm_worker: follow up to r1821624.

Free idle pools while stopping.

mpm_fdqueue: follow up to r1821624.

Be explicit in the naming about what's push/pop-ed.

mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.

mpm_fdqueue: follow up to r1821624.

Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().

mpm_fdqueue: follow up to r1821624.

Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).

mpm_fdqueue: follow up to r1821624.

80 colums.

Follow up to r1821624: CHANGES entry.

Submitted by: ylavic

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

Convenient branch to merge common fdqueue code for MPMs event/worker.

That is, r1821624 and follow ups.

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

Propose.

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

Propose.

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

Backported in r1824333.

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

Merge r1667707, r1824332 from trunk:

* mod_proxy: Allow setting options to globally defined balancer from
  ProxyPass used in VirtualHost. Balancers are now merged using the new
  merge_balancers method which merges the balancers options.

mod_proxy: follow up to r1667707: MMN minor bump.

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

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

Vote, promote.

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

backport vote

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

propose backport of r1667707

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

Add CHANGES entry

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

Another comment

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

Comment

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

Backported in r1824248.

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

Merge r1776575, r1776578, r1776624, r1776627, r1776674, r1776734, r1776740, r1778268, r1780725, r1781030, r1781031, r1781701, r1788674, r1789800, r1790169, r1790457, r1790691, r1806985, r1812332, r1818279 from trunk:

Merge new PROXY protocol code into mod_remoteip

Fix typo in mod_remoteip's doc

Shorten RemoteIPProxyProtocolEnable to RemoteIPProxyProtocol and correct references in docs

Move attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES

On the trunk:

* mod_remoteip: added cast to fix clang compiler error

Reinsert attribution to mod_remoteip.c for PROXY protocol

* Silence compiler warning

Set all read buckets aside in case we need to restore all during optional header processing

* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
  by moving deference of header array via a different pointer type
  ("type-punning") out of line.

* modules/metadata/mod_remoteip.c (register_hooks,
  remoteip_hook_pre_connection): Reference the filter by handle rather
  than name (avoiding tree lookup by name on use).

Change tactic for PROXY processing in Optional case

Finally include feedback from Ruediger Pluem. Add slave "backoff" verified by Sander Hoentjen

Update PROXY handling by removing Optional processing

Rename RemoteIPProxyProtocolDisableHosts to RemoteIPProxyProtocolExceptions

Fix directive name in
(s/RemoteIPProxyProtocolDisableNetworks/RemoteIPProxyProtocolExceptions/)

Use cmd->cmd->name instead to be future proof.

XML update plus typo in mod_remoteip.xml.

PROXY protocol proposal corrections

Fix format pattern (%lu => %APR_SIZE_T_FMT).

Detected by maintainer mode compilation and GCC error:

.../modules/metadata/mod_remoteip.c:
In function 'remoteip_input_filter':
.../include/http_log.h:117:33:
error: format '%lu' expects argument of type
'long unsigned int', but argument 8 has type
'apr_size_t {aka unsigned int}' [-Werror=format=]

APR-ize uint types

Submitted by: druggeri, elukey, druggeri, druggeri, druggeri, icing, druggeri, rpluem, druggeri, jorton, jorton, druggeri, druggeri, druggeri, druggeri, jailletc36, lgentis, mrumph, rjung, jim
Reviewed by: druggeri, jim, minfrin

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

Revert r1824221: wrong backport.

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

propose T&R

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

Merge r1745863, r1745864 from trunk:

Fix segfault with logresolve -c and IPv6

Due to a logic error, there could be a NULL pointer dereference.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823259

Fix comment typo

Submitted by: sf
Reviewed by: jailletc36, minfrin, jim

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

promote

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

Backport vote

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

mod_remoteip: Add PROXY protocol support
trunk patch: http://svn.apache.org/r1776575
             http://svn.apache.org/r1776578 (doc fix)
             http://svn.apache.org/r1776624
             http://svn.apache.org/r1776627 (shortened name + doc fix)
             http://svn.apache.org/r1776674 (attribution moved to CHANGES)
             http://svn.apache.org/r1776734
             http://svn.apache.org/r1776740 (attribution updated in mod_remotip.c)
             http://svn.apache.org/r1778268 (fix compiler warning)
             http://svn.apache.org/r1780725 (set buckets aside)
             http://svn.apache.org/r1781030 (fix strict GCC warning)
             http://svn.apache.org/r1781031 (reference the filter by handle)
             http://svn.apache.org/r1781701 (rework optional processing case)
             http://svn.apache.org/r1788674 (final edge cases/ignore slave conns)
             http://svn.apache.org/r1789800 (remove optional processing)
             http://svn.apache.org/r1790169 (rename "exception" directive)
             http://svn.apache.org/r1790457 (Update directive name in err message)
             http://svn.apache.org/r1790691
             http://svn.apache.org/r1806985
             http://svn.apache.org/r1818279
2.4 convenience patch (includes CHANGES):
             http://home.apache.org/~ylavic/patches/RemoteIPProxyProtocol.2.4-v3.patch
+1: druggeri, jim, minfrin

[Reverted by r1824246]

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

Make an explicit patch.

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

Follow up to r1824187: record mergeinfo(s).

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