from trunk r1406646: user-defined needs the hyphen

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

from trunk r1406616: comment spelling fix

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

Updates.

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

Another proposal...

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

More backport proposals

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

Just placeholders

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

Merge 1403492:
fix cut'n'paste error

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

xforms

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

Backport r1403476:

Mention string-valued expression in the BNF.
Clarify when header names are added to the Vary header.

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

Adding .fr translation for rewritemap doc

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

Adding .fr translation for rewrite's remapping doc

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

xforms

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

r1403041

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

Adding .fr translation for rewrite's proxying doc

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

Adding .fr translation for socache documentation.

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

Update xforms

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

Merge r1400700 from trunk:

Change default for SSLCompression to off, as compression
causes security issues in most setups

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1399413 from trunk:

Export mod_xml2enc.h so that others can use the module.

Submitted by: minfrin
Reviewed/backported by: jim

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

promote

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

votes

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

note docco avail

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

mis-merge

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

Merge r1387085 from trunk:

Use our private function and just allow for conditonal
concat of .persist suffix

Reviewed/backported by: jim
Merge r1386726 from trunk:

Add debug output when slotmem is persisting shm

Reviewed/backported by: jim

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

Committed revision 1400946

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

Merge r1395225 from trunk:

Allow forced setting of TLS1.1 and TLS1.2 protocols with
the -f command-line switch, and adapt the output to more accurately
report what SSL/TLS protocol was negotiated (use SSL_get_version()
instead of SSL_CIPHER_get_version()).

PR: 53916
Submitted by: Nicolás Pernas Maradei <nico emutex com>
Reviewed/amended by: Kaspar Brand

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1370763 from trunk:

mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.

Submitted by: trawick
Reviewed/backported by: jim

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

Adding documentation patch link for 'FallbackResource disabled' backport

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

easy vote / comment

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

propose

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

Updates.

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

promote, propose, etc.

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

Typo

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

Propose.

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

vote/promote

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

Voting for my own proposal

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

Suggest FallbackResource 'disabled' patch into 2.4

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

Reverting commits r1398064 (src) and r1398065 (doc) as the approval process was not applied.

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

Documenting the new 'disabled' argument accepted by FallbackResource

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

Adding support for the 'disabled' keyword to FallbackResource

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

Updates.

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

Typo correction.

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

Merge r1397681 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

PR53998, stray mod_access reference in mod_info

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

vote/promote/propose

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

fix typo in r1396879

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

example

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

trivial typo

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

Rebuild

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

Add example

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

vote

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

Rebuild

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

More specific about default MPM selection

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

patch vote

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

Rebuilds previous change made only in the XML.

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

Adds some clarification to the statement that a default MPM is selected
"depending on platform capabilities"

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

propose, vote, promote, comment

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

xforms

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

Backport r1394984:
Note that AllowOverride changed its default value to None in 2.3.9
As per comment #264 on site.

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

Update SVG version of powered-by for 2.4

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

suggest r1394079 as the docco fix

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

Merge r1392347 from trunk:

core: ErrorDocument now works for requests without a Host header.

PR: 48357

Submitted by: trawick
Reviewed/backported by: jim

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

promote

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

vote

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

Merge r1393058 from trunk:

mod_include: When an include file or virtual path fails, include the result
code that tells us why.

Submitted by: minfrin
Reviewed/backported by: jim

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

Merge r1393033 from trunk:

mod_include: When +Includes is not set and we disable mod_include, tell
the administrator where this happened.

Submitted by: minfrin
Reviewed/backported by: jim

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

promote

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

2 votes

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

Comment on doc suggestion

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

Merge r1387088 from trunk:

Add in new type CLEARINUSE which allows the inuse table to
be cleared upon storage. This may be expected/wanted/required
by some applications

Reviewed/backported by: jim

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

promote

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

simple WinNT MPM fix?

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

Merge r1374877,1374880,1375013,1389316 from trunk:

WinNT MPM: minor improvements

Reviewed by: gsmith, rjung

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

Fix spelling mistake.

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

property fix.

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

update transformation

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

Another vote.

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

Add a comment.

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

Some votes and comments.

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

Backporting the new powered-by images from trunk and removing the animated gif.

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

One merged.

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

Merge 1387633,1392850 from trunk:

* server/mpm/prefork/prefork.c (child_main): Don't log errors for an
  apr_pollset_add() failure if a graceful-stop has been signalled.

follow up to r1387633: use the right exit code depending on the error scenario

Submitted by: jorton, trawick
Reviewed by: trawick, minfrin, jorton

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

mod_proxy: Avoid double slash with "ProxyPassReverse / ..." cases
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1386576
             http://svn.apache.org/viewvc?view=revision&revision=1386578
2.4.x patch: trunk patch works
+1: jim, druggeri, minfrin

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

Remove revisions added when they should not have been.

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

mod_cache: Wrong content type and character set when mod_cache serves
stale content because of a proxy error. PR 53539. Correction to r1361153.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1373447
2.4.x patch: trunk patch works.
+1: rjung, jim, minfrin

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

Vote and promote.

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

Vote and promote.

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

Add a comment.

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

Vote.

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

Propose.

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

Merge r1386822 from trunk:

More consistent return errors...
Reviewed/backported by: jim

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

vote+promote "mod_slotmem_shm: Consistent and logical return errors"

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

be suspicious of sick children on a school day

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

missing-host-header error path tweak

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

Update.

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

Updates.

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

The LuaCodeCache patch seems stalled to me :)

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

ez patch

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

Committed revision 1390518.

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

backport r1385216, r1387610 from trunk:

Spin off module-specific build options into separate build vars.
[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.

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

And promote MOD_CFLAGS

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

Vote on MOD_CFLAGS

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