Tweak text, credit Niels.

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

-l and -L are not exclusive.
Document the 'G' suffix.

See PR 63638

(r1864786 in trunk)

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

Merge of r1864693,1864695,1864703 from trunk;

  *) mod_proxy: Improve XSRF/XSS protection. [Joe Orton]

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

vote

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

Synch a bit with trunk

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

Merge r1709121 from trunk:

mod_session: Introduce SessionExpiryUpdateInterval which allows to
configure the session/cookie expiry's update interval. PR 57300.

Submitted by: Paul Spangler <paul.spangler ni.com>
Reviewed/Committed by: ylavic

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

Vote, promote.

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

When did 80 char max line lengths go out of fashion?

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

ENOCOFFEE.

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

Comment.

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

Vote.

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

propose SessionExpiryUpdateInterval

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

followup to r1864734

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

Add missing APLOGNO

(r1864733 in trunk)

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

quick vote on balancer

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

proxy-balancer XSRF/XSS fixes.

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

lognos from trunk

some mergeinfo blocked `svn merge` from taking any action so I did diff/patch.

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

stapling logno

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

Merge r1864699 from trunk:

lognos

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

no votes for APLOGNO commits.

99% sure but please reply

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

Merge r1856560, r1856561, r1856846 from trunk:

Update apr_common.m4 to latest (trunk).

Note: why is that file in the httpd repo??

Revert r1856560: was not the latest apr_common.m4 version anyway...

How does that change came in my local workspace in the first place??

Well, our build with latest APR trunk seems to insist on updating apr_common.m4

So be it.

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

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

Merge r1864526 from trunk:

* modules/metadata/mod_remoteip.c (remoteip_process_v2_header,
  remoteip_input_filter): Add sanity checks.

Submitted by: jorton, Daniel McCarney <cpu letsencrypt.org>

Submitted by: jorton
Reviewed by: jorton, covener, jim

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

promote

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

backport votes

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

Vote.

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

Propose.

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

vote

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

1*stalled, 1*proposed.

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

update after backport

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

Merged /httpd/httpd/trunk:r1864428 from trunk

  *) mod_ssl: reverting a 2.4.40 change where a superfluous SSLCertificateChainFile configuration

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

and promote

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

backport vote

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

Merged /httpd/httpd/trunk:r1864435,1864438,1864450-1864451,1864464 from trunk:

  *) modules/filters: PR 63633: Fix broken compilation when using old GCC (<4.2.x).

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

vote and promote

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

Vote.

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

Add r1864464 and reset vote.

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

Rearrange long mod_md CHANGES entry in an attempt
to give it a better structure. I hope I got it right.
Also dropped misleading reference to missing mod_ssl
backport.

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

Propose with essay.

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

Add another patch to fix the new use of pragma.
Still under test.

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

desk-check mod_md related revert

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

Note some progress, not yet rady vor vote.

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

 proposing backport of r1864428

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

Merged /httpd/httpd/trunk:r1864425

 * mod_md: assigning APLOGNO(), silencing compiler warnings

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

Post 2.4.40 tag updates

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

Get ready to tag httpd 2.4.40

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

Merge of r1864192 from trunk:

  *) core, rewrite: Set PCRE_DOTALL by default

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

votenpromote

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

Merge of r1863635 from trunk:

  *) md_crypt: Wrap get_ct_scts_nid(void) definition to avoid unused function error
     when building in maintainer mode. [jim]

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

update after backport

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

Merge of r1864191 from trunk:

  *) core, proxy: remove request URL and headers from error docs (CVE-2019-10092)
     [Eric Covener]

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

votenpromote

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

* Vote and promote

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

propose recent trunk revs

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

Merged /httpd/httpd/trunk:r1864153

Fix unnecessary redefinition of AP_ENABLE_EXCEPTION_HOOK. [Eric Covener]

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

update transformation

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

Fix properties

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

merge information from  h2 backport

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

Merge of r1861338,1862475,1862583,1862865,1863221,1863276 from trunk:

  *) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on
     merged header fields, just as HTTP/1.1 does. [Stefan Eissing, Michael Kaufmann]

  *) mod_http2: fixed a bug that prevented proper stream cleanup when connection
     throttling was in place. Stream resets by clients on streams initiated by them
     are counted as possible trigger for throttling. [Stefan Eissing]

  *) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
     more to write with streams ongoing (flow control block). The timeout waiting
     for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not
     Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]

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

* Vote and promote

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

vote

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

Add CHANGES for r1864005
(backport of r1856829 from trunk).

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

Merge r1856829 from trunk:

  *) mod_proxy: Load balancer byrequests required when bytraffic chosen
     PR 62372

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

vote and promote

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

Add CHANGES for r1864000
(backport of r1853560 from trunk).

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

update after backport

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

Merging r1853560 from trunk:

  *) mod_proxy_hcheck: Create the configure for mod_proxy_hcheck when used in BalancerMember.
     PR 60757

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

vote and promote

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

update after backport

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

Merged /httpd/httpd/trunk:r1851621,1852128,1862075

  *) mod_ssl/mod_md: reversing dependency by letting mod_ssl offer hooks for
     adding certificates and keys to a virtual host. An additional hook allows
     answering special TLS connections as used in ACME challenges.
     Adding 2 new hooks for init/get of OCSP stapling status information when
     other modules want to provide those. Falls back to own implementation with
     same behaviour as before.

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

Backport proposal

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

mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
This is way too verbose (every 100ms) to be logged at any LogLevel.

Backport of r1853992 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, jailletc36, jim

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

core: fix crash when running with apr lib build with APR_POOL_DEBUG.
Observed with huge config and mod_security using long config lines.

Backport of r1863179 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, icing, jim

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

and promote

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

Backport votes

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

fr doc - Adding new html file after rebuild.

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

Vote

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

fr doc rebuild.

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

fr doc - adding a new xml file.

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

Propose.

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

Follow up to r1863315.
Update MODULE_MAGIC_NUMBER_MINOR

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

remove useless mail address for a comitter

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

vote

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

cleanup after backport of change

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

Merge of r1862014 from trunk:

  *) mod_proxy_hcheck fix for BZ 60948

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

Merge of r1851146 from trunk:

  *) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
                    an URL that contains a :port.
                    PR 53915 [Rein Tollevik <rein basefarm.no>]

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

Merge of r1426802,1744460,1829799,1824716,1838318,1840678,1861294

  *) easy patches to synch 2.4.x and trunk:
        - core: extend description of r->hostname
        - mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL
        - core: Save a few cycles in 'ap_parse_form_data()'
        - mod_cache_socache: Save some cycles
        - mod_proxy_ftp: Save some cycle
        - vhost: move an assignment to the end of the loop to ease readability and please a compiler
        - core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'

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

Merge of r1847430,r1853302 from trunk:

  *) core: Split out the ability to parse wildcard files and directories
     from the Include/IncludeOptional directives into a generic set of
     functions ap_dir_nofnmatch() and ap_dir_fnmatch().

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

 * vote+promote

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

update proposal

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

Propose.

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

modules/md/mod_md.mak
update to mod_md 2.0

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

Done.

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

Merge r1857859 from trunk:

Fix a compilation error when GPROF is defined.

Submitted by: jailletc36
Reviewed by: jfclere, icing, jim

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

1 done, 1 paused, 1 vote.

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

Merge r1858565 from trunk:

* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe
  error better for anon shm failure case, fixing gcc 9 warning on
  passing NULL for '%s'.

Reviewed by: jorton, icing, jim

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

promote

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

backport votes

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

mod_md v2.0.8: synching wiht github release.

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

updated http2 backport proposal

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

mod_md: adapting to the latest mod_ssk hook changes.

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