Rebuild

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

update transformation

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

Merge r1570288 from trunk:

  *) mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore,
     and IgnoreInherit to allow RewriteRules to be pushed from parent scopes
     to child scopes without explicitly configuring each child scope.
     PR56153.

Submitted By: Edward Lu
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@1570684 13f79535-47bb-0310-9956-ffa450edef68

ipromote

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

ivote

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

Propose mod_proxy_http easy fixes.

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

Backport r1570528

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

Merge r1542379 from trunk:

PR: 54852. Only use a dummy_connection for idle processes
Reviewed/backported by: jim

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

backported

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

   * core: Detect incomplete body in HTTP input filter and return
              APR_INCOMPLETE. PR 55475.
     trunk patch: http://svn.apache.org/r1538776
          2.4.x patch: https://people.apache.org/~ylavic/2.4.x-http_filter_incomplete.patch

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

Merge r1551685 from trunk:

FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1569615 from trunk:

handle POLLERR/POLLHUP during poll() to avoid high CPU busy loop.

Submitted By: Joffroy Christen <joffroy.christen solvaxis com>, Eric 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@1570321 13f79535-47bb-0310-9956-ffa450edef68

some votes

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

propose mod_rewrite enhancement

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

update transformation

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

backported

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

xforms

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

mod_lua: Backport setcookie changes. PR 56128

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

Merge r1487528, r1563379, r1563381, r1565711 from trunk:

* server/protocol.c (r_flush): Use int return type as per declaration
  of apr_vformatter(); no functional change.

Use %pm in order to save 8k of stack in 'ap_pcfg_strerror'

s/apr_pstrndup/apr_pstrmemdup/ when applicable

follow-up to r1096569:

remove unnecessary total_modules calculation

Submitted by: jorton, jailletc36, jailletc36, trawick
Reviewed/backported by: jim

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

ipromote

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

ivote

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

vote

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

propose wstunnel fix

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

Rebuild

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

Flipped links, L and END flags

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

Alpha-ordering

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

Insert missing space.

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

Merge r1542562 from trunk:

We were not being consistent between http and others
if we added the default port or not during the canonizing
phase... Baseline the http method (don't add unless the
port provided isn't the default).
Reviewed/backported by: jim

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

Vote for mod_proxy fix.

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

New proposal about incomplete request/response bodies detection.

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

Backported

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

Merge r1545286, r1545292, r1545325, r1545364, r1545408, r1545411 from trunk:

Use a normalized offset point for idlers... still need to worry
that atomics work as "expected", in this case that a add32 of a -1
is the "same" as dec32 (as far as effect on idlers)

r1545286 for eventopt

Use correct type...

Use offset which is smack dab in the middle.

naming suggestion re: trawick

Consistent types
Reviewed/backported by: jim

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

Merge r1564756 from trunk:

mod_proxy_fcgi: Fix error message when an unexpected protocol version
number is received from the application.

PR: 56110

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1564052 from trunk:

Correct the trusted proxy match test in mod_remoteip. PR 54651.\n\nSubmitted By: Yoshinori Ehara <yoshinori ehara gmail com>\nEndorsed By: Eugene L <eugenel amazon com>\nCommited By: mrumph
Submitted by: mrumph
Reviewed/backported by: jim

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

Merge r1563420 from trunk:

enable auto curve selection for ephemeral ECDH keys
when compiled against OpenSSL 1.0.2 or later

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1564475 from trunk:

Use the correct IP addresses to populate the proxy_ips field
in mod_remoteip.c.  PR 55972.

Submitted by: mrumph
Reviewed/backported by: jim

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

ipromote

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

ivote

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

Votes.

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

update transformation

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

Merge r1568652, r1568653 from trunk:

linkify internal <directive> tags

xform

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

vote/promote remote_ip

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

Updates.

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

Rebuild

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

Rebuild mod_deflate docs. (Remove Netscape 4 advice.)

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

Remove configurations referring to browsers from the dim and distant past.

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

Merge r1567221 from trunk:

mod_lua: Fix r:setcookie() to add, rather than replace,
the Set-Cookie header. PR56105

Submitted By: Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>
Committed By: covener

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

update transformation

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

vote +  easy proposal

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

some votes

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

Merge r1563418 from trunk:

Add %{CONN_REMOTE_ADDR} to mod_rewrite. PR56094

Submitted By: Edward Lu <Chaosed0 gmail com>
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@1566702 13f79535-47bb-0310-9956-ffa450edef68

Updates.

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

Vote.

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

promote mod_rewrite fix

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

Updates.

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

update transformation

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

update German translation

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

update transformation

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

add example containers

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

update transformation

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

port style and dtd changes from trunk

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

update certkeyfile proposal with SSL_CTX_set_current_cert stapling init loop

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

Vote for mod_rewrite fix.

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

Correct the PR # in proposal.

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

rename zh-cn html files and update transformation

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

build bootstrap

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

add utf8 extension to zh-cn html files

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

fix tr docs charset

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

propose, tidy up

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

Backport r1564727: Fix support for uploading files by using pushlstring instead of pushstring when pushing binary data.

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

propose mod_remoteip fix

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

update transformation

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

update German translation

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

Merge r1523387 from trunk:

In 2.4, the MPM leaves a copy of the non-disconnected FD sitting in
context->accept_socket. This FD will be closed a second time, often
shortly after a worker picks it up in this same FD being reused.  The
first recv fails with WSAENOTSOCK since the same FD was closed in the
listener thread while the worker was pulling it off the queue

(The second close is of the underlying FD/socket, not a shared
apr_socket_t, so it's not short-circuited)

This patch makes it a bit more 2.2.x-ish and solves my problem -- the
context->accept_socket gets zapped at the bottom of the loop if
!disconnected.

Submitted by: covener
Reviewed/backported by: jim

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

ipromote

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

ivote

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

update transformation

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

fix sitemap c&p error

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

d'oh. module name fixes.

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

propose mod_remoteip fix

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

build bootstrap

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

activate chm build

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

update transformation

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

url fixes

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

port latex/pdf changes from trunk

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

update transformation

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

update a few German translations

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

update transformation

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

svn:eol-style = native

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

port style changes from trunk

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

build bootstrap with new xalan

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

update transformation

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

prepare for upcoming xalan update

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

Updates.

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

msdn url change.

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

build bootstrap

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

port retirement styles from trunk

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

Drop stalled RFC 5878 backport proposals (reverted in trunk with r1468131),
as they have been obsoleted through "SSLOpenSSLConfCmd ServerInfoFile"
meanwhile (r1555683, and CT is no longer using SSL_CTX_use_authz_file either).

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

add followup fix to certkeyfile proposal (and reset jorton's vote)

add auto-ECDHE curve selection backport proposal

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

propose mod_rewrite fix

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