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

kbrand++

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

propose SSLCertificate[Key]File/SSLCertificateChainFile overhaul for mod_ssl

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

vote

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

update transformation

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

fix broken references

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

propose a WinNT fix

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

backport debugging

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

update transformation

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

- apply various table and formatting fixes, which halted the pdflatex run
- also add mod_filter_old.png (converted from .gif), required for inclusion in
  latex

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

update transformation

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

apply style updates from trunk.

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

svn:eol-style = native

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

Merge r1556206 from trunk:

avoid a tight busy loop with memory allocations when the [N] flag
isn't making progress.

If backported, probably increase the hard-coded limit to 32k from 10k.

Submitted by: covener
Reviewed/backported by: jim

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

(forgotten promotion)

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

thanks!

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

bump patch to 32k rounds, leave jim's vote since it only got more conservative.

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

Merge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r1463046 from trunk:

Style, indentation. No functional change.

As in 'dav_generic_do_refresh', add missing break in 'dav_fs_do_refresh' to avoid useless computation.

Add missing break in 'dav_generic_do_refresh' to avoid useless computation.

Allocate correct size for the array to avoid useless memory allocation and copy

Add missing break.

Oops (fix r1556912)

No need to test for NULL, apr_pstrndup already handles it.

Remove some useless declarations that were shadowing other local
variables of the same name.

Submitted by: jailletc36, sf
Reviewed/backported by: jim

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

vote, note, promote

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

ivote

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

Remove proposals.

I will propose another patch later in order to be able to control at runtime WANT_BASENAME_MATCH, but without changing the current behaviour.

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

Easy proposals

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

ivote

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

UDS for rewrite patch backport proposal

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

remove this whole ftok mess.

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

propose mod_rewrite loop-breaking patch, fix some formatting.

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

these filter tweaks to mod_lua were committed as part
of r1523974 in 9/2013, so they were in 2.4.7. retcon them
into the bottom of 2.4.7 CHANGES.

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

propose mod_dir option to step out of the way with another handler is configured

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

backported in r1560697

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

Updates.

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

Merge r1560977 from trunk:

mod_session: When we have a session we were unable to decode, behave as if there was no session at all.

Submitted by: minfrin
Reviewed/backported by: jim

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

ipromote

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

ivote

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

+1

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

Propose.

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

small amount of trunk r1560738: point to definitive support info

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

from trunk r1560729: remove some broken links, point to better resources

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

Merge r1559828 from trunk:

mod_session: Fix problems interpreting the SessionInclude and
SessionExclude configuration.

PR: 56038
Submitted by: Erik Pearson <erik adaptations.com>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1557641, r1559394, r1559398 from trunk:

don't search for directory indexes/directoryslashes if a URL is in the
middle of being rewritten [in per-dir context]. PR53929

followups to r1557641 suggested by nd -- add
prefix to both the macro and the handler name
itself.

no make depend in sandbox, fix bld break from r1559394

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1546692 from trunk:

Axe dead code: It wouldn't have been needed ever since httpd 2.0.35
was released in April 2002... it was fixed in the [unreleased]
SSLeay 0.9.1b, which was the basis for the initial OpenSSL 0.9.1c
release in December 1998 (specifically, it's this change to ssl_set_pkey():
https://cvs.openssl.org/filediff?f=openssl/ssl/ssl_rsa.c&v1=1.1.1.2&v2=1.1.1.3)

Submitted by: kbrand
Reviewed/backported by: jim

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

ipromote

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

ivote

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

Vote.

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

Vote.

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

merge r1560679 from trunk:

httpd allocates separate AF_INET/AF_INET6 sockets automatically
when v4-mapped addresses are disabled

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

propose

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

+1!

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

Updated patch

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

xforms

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

Merge r1518269 from trunk:

Expires in a 304 is not a contradiction in terms of r1487118:

     - Expires, Cache-Control, and/or Vary, if the field-value might
        differ from that sent in any previous response for the same
        variant

Submitted by: covener
Reviewed/backported by: jim

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

ipromote2

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