promote

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

votes

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

Rebuild.

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

XML updates.

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

SO_REUSEPORT with (part of) wrowe's concerns.

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

vote on reverting FallbackResource patch.

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

be normal

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

pull out half-baked fallbackresource patch

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

fix bld, still SSL_LIBRARY_NAME in this branch.

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

Redundancy here is not a bad thing

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

Propose.

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

Propose

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

Raise minor objections, easily tweaked

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

Merge r1674542, r1675410, r1676842 from trunk:

mod_ssl: Check for RAND_egd() at configure time and only use it if present.
Fixes the build with LibreSSL which does not provide this function.

Submitted by: Bernard Spil <pil.oss gmail com>, stsp
Committed by: stsp

mod_ssl: Make the config parser complain if SSLRandomSeed specifies
the Entropy Gathering Daemon (EGD) as source while the underlying
SSL library does not support EGD (e.g. in case of LibreSSL).

Suggested and reviewed by: kbrand

Follow up to r1674542 and r1675410: CHANGES entry.
Submitted by: stsp, ylavic
Reviewed/backported by: jim

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

change vote

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

Propose fix for PR 46421.

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

Add CHANGES entries for backports r1677187 and r1678235 (like 2.2.30's).

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

Vote, promote.

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

make docs

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

Rebuild.

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

XML updates.

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

xforms

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

sync note with trunk

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

Rebuild.

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

XML updates.

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

Rebuild

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

apply change from trunk

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

So far, looks OK. Revised patch applies cleanly and completely to 2.4 HEAD

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

Merge r1585609 from trunk:

Allow Require expr to work when the expression is quoted.

For example as appears in our documentation:
Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"

PR: 56235

Submitted by: breser
Reviewed/backported by: jim

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

Merge r1677462 from trunk:

mod_dav: Avoid doing the walk on a COPY source for handling preconditions if
there are no preconditions provided.

* modules/dav/main/util.c:
  (dav_validate_request): avoid validating locks and ETags when there are
    no If headers providing them on a resource we aren't modifying.

Submitted by: breser
Reviewed/backported by: jim

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

i ProxySCGIInternalRedirect with alternate response header

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

Merge r1676085 from trunk:

consistently output SSLCertificateChainFile deprecation warnings
Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1664133, r1643284, r1621417 from trunk:

* Fix typo in error message

mpm_event(opt): zero is immutable.

Fix printf format spotted by cppcheck.
Untested.
Submitted by: rpluem, ylavic, jailletc36
Reviewed/backported by: jim

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

Propose real HEAD responses with zero C-L fix.

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

Vote hence promote.

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

a few votes

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

easy vote

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

Easy proposals (synch with trunk)

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

* STATUS: Nominate r1677462

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

* STATUS: Vote for PR 56235 nomination.

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

Rebuild.

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

XML updates.

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

Rebuild.

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

XML updates.

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

Follow up to r1677187.
Add compatibility note

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

Merge r1675533 from trunk:

mod_log_config: Add %M format to output request duration in milliseconds.

Submitted by: breser
Reviewed/backported by: jim

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

Merge r1675103 from trunk:

If a directory exists but no indexes can be resolved, the fallback resource
should be attempted first before giving up.

Submitted By: Jack <tjerk.meesters gmail.com> , covener
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

promote

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

votes

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

Rebuild.

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

XML updates.

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

Fix typo.  PR57879

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

merge r1677096 from trunk

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

Fix typo

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

Working on it.

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

Propose.

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

merge r1676654 from trunk

The increased use of UuidCreate() in APR 1.5.2+ introduces an unresolved
reference to UuidCreate() to these support applications that link with
apr-1.lib and do not already link rpcrt4.lib.

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

Rebuild.

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

XML updates.

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

remove mod_ssl proposals which have been in the STALLED category for 20+ months

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

adjust link to SSL_CONF_cmd man page on www.openssl.org, again

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

Merge r1650047 from trunk:

Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
  of subjectAltName entries for the "StdEnvVars" case

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
  individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
  or with full-list extraction to the environment ("StdEnvVars")

* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype

* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
  SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
  code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
  suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
  entry types appearing in user or server certificates (i.e., rfc822Name
  and dNSName), for the time being.

* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
  and SSL_X509_getSAN prototypes

Proposed by: kbrand
Reviewed by: ylavic, druggeri

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

promote, and add a tiny mod_ssl proposal

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

Votes all around

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

* STATUS: Nominate r1675533.

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

update transformation

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

mod_proxy_scgi: ProxySCGIInternalRedirect with alternate response header

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

Generated doc changes

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

Grammar improvements in performance tuning doc

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

Generated doc changes

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

Merge r1675455 from trunk:

fix syntax

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

Merge r1675441 from trunk:

no --with-perl since 1.3

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

xforms

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

Merge r1675436 from trunk:

add a prominent caveat about the effect of caching.

PR55089

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

xforms

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

Merge r1675426, r1675429 from trunk:

PR57778

document legacy AddType/ForceType magic types as Handler names
for the curious.

typoes

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

Applies (updated) patch from bz56214 from Javier Llorente. Updates
spanish translations of error documents.

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

propose fallbackresource PR

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

Generated doc changes

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

Grammar improvements in performance tuning doc

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

Generated doc changes

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

comment

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

backported

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

Merge r1666468, r1666618, r1674697 from trunk:

mpm_event: Allow for timer events duplicates.
Meanwhile ap[r]_skiplist_add()...

mpm_event: follow up to r1666468.
We only need one compare function for add semantic with apr_skiplist_insert()
and unique timers (pointers). It also should work with apr_skiplist_remove()
and apr_skiplist_find(), be they used some day.

mpm_event: follow up to r1666468 and r1666618.
We don't need to return 0 in the compare function, but for debugging purpose
which we could implement later if necessary (in a separate function).
For now, keep the function simple as in 2.4.x to ease backport, and add a
comment about why we never return 0 here.

Submitted by: ylavic
Reviewed/backported by: jim

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

promote

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

ok

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

comment before vote

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

Comment on r1656259.

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

Comment on r1674697.

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

Add CHANGES for r1674659 and r1674660.

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

Correct merge error in r1673860 and r1673871:
move CHANGES entries to correct version.

Use "mod_ssl" instead of "ssl".

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

high latency chat via STATUS

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

backport question/vote

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

comment/question

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

Merge r1674632 from trunk:

mod_proxy_wstunnel: Bypass the handler while the connection is not
upgraded to WebSocket, so that other modules can possibly take over
the leading HTTP requests.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1671397, r1672466, r1672564 from trunk:

Add output for "?auto" version of server-status
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.

Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name

More followon to r1671397 for proxy server-status
in auto mode:
- remove remaining HTML markup

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1671396, r1672289, r1672453 from trunk:

Add more data to "?auto" view of server-status.

Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.

Followon to r1671396:
Remove unwanted redundant output introduced
by that commit.

Followon to r1671396: add misiing newline in
new server-status output.

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1646282 from trunk:

* Fix If-Match handling:
  - We need to fail if we do NOT match.
  - ETag comparison only makes sense if we have an ETag

PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed/backported by: jim

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

promote

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

vote

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