propose r1408958 (+ style issue) backport

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

Update.

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

bump minor

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

Typo in comment (r1407526 in trunk)

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

Typo in comment (r1374856 in trunk)

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

Backport proposal for small things to keep 2.4.x in line with trunk as much as possible.
Cumulative patch available and tested.

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

add rewritebase proposal

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

Rebuild

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

Remove a silly paragraph that recommends doing something stupid.

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

vote/promote

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

Found a couple more trunk fixes that were "forgotten" to
be backported...

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

   * core: Add in ap_get_sload() and ap_get_loadavg().

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

promote

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

Pushed one (sorry for that screwup, all LDAP-on-Windows users), add one.

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

Merge 1408402 from trunk:

followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included

Submitted by: covener
Reviewed by: covener, trawick, igalic

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

easy votes

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

Merge r1399708 from trunk:

only write the first len chars to syslog, as the buffer may have additional
text added speculatively

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1397172 from trunk:

"Iterate" directives: Report an error if no arguments are provided.

Submitted by: trawick
Reviewed/backported by: jim

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

Vote, promote

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

+1 for MS SDK fix

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

propose LDAP_UNAVAILABLE windows fix

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

Merge r1407965 from trunk:

Replace an incorrect #if by the correct corresponding #if defined(...)

PR 54133 reported by Teodor Milkov ()
Submitted by: jailletc36
Reviewed/backported by: jim

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

Promote and vote

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

backport vote

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

Vote.

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

easy vote + editorial tweaks

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

xforms

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

Merge r1408093:

Remove SSLv2 stuff that is no longer supported. Add a few newer algorithms
and cipher aliases. This is incomplete, but the openssl 1.0.1c man pages
don't have the complete list either :-(

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

Correct address of trunk patch

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

Propose

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

update list of DefaultRuntimeDir revisions in trunk that need
adjusting for 2.4.x

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

s/Options/AllowOverride/ in comment describing AllowOverride

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

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