Merge r1452281 from trunk:

cache_storage: remove useless test + update function name in debug log + skip as soon as we know headers do not match
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1458456 from trunk:

Useful extensions...
Reviewed/backported by: jim

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

Merge r1457437, r1457520 from trunk:

Expression parser: Add the ability to base64 encode and base64 decode
strings within the parser.

Remove the comment, this is done.

Submitted by: minfrin
Reviewed/backported by: jim

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

ipromote

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

ivote

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

Vote, pick a nit.

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

vote/promote/cleanup addressed comments

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

Include all trunk patches

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

Update the proposal.

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

Add r1458003 to the proposal.

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

Easy votes, promote, comment, propose.

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

Updates.

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

propose, vote

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

Updated patch - thanks, Bill

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

Put this backport for now on hold to get some more
time for testing ...

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

Easy proposals

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

Comment

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

Rock the vote

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

Propose an easy one

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

Easy proposal

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

align

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

Align comments in examples

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

remove a superceded comment, but add a new one.

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

Merge r1447993 from trunk:

    mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
    in the error log to debug level.  [William Rowe]

Submitted by: wrowe
Reviewed/backported by: jim

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

Merge r1453604 from trunk:

fix merge of min/max file size by setting corresponding _set

Submitted by: covener
Reviewed/backported by: jim

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

2 proposals

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

Merge r1465828 from trunk:

PR54813 authz_dbm used to respond to 'Require group ...'

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

xforms

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

Add example use case to doc

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

LoadModule is no longer a "new" directive in 2.4

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

Update.

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

transform via "make docs", adding mod_macro.html.fr

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

* Add a comment

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

Add mod_macro to Windows Build. merge/backport r1436058

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

add missing generated mod_macro files

Pointed out by: Tom Evans

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

typo

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

Updates.

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

various xforms (people should really rebuild docs when they commit changes ;/)

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

typo fix as per comment #983 on site

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

Just one example

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

Merge from trunk

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

Update proposal to include documentation patch.

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

Updated to use hex encoding.

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

Reply.

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

comment

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

[2.4] Adding .fr translation for a number of platform docs.

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

[2.4 Doc] Adding .fr translaation for a number of modules

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

Vote.

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

The expressions parser is pure awesome. Propose.

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

Backport r1457521.
RPM spec file: we depend on libuuid-devel to build.

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

Revert, let us try that again.

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

Backport r1457520.
RPM spec file: we depend on libuuid-devel to build.

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

Update.

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

spelling fixes

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

Merge r1456061 from trunk:

PR54687:  note that REQUEST_FILENAME is influenced by AcceptPathInfo

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

Added mod_macro to NetWare build (backport r1435834).

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

rebuild

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

Phrasing tweak

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

Merge r1442865, r1442759, r1442326, r1442309, r1448171, r1418556, r1448453, r1425771, r1425772, r1425775 from trunk:

Change bzero/bcopy into memset/memcpy

PR 54346

Can't figure out why we allocate len+2 bytes here. Len+1 should be enough.

Fix valgrind warning about uninitialized memory in argument to semctl

PR: 53690
Submitted by: Mikhail T. <mi+apache aldan algebra com>

fix valgrind warnings about uninitialized memory in syscall arguments

This is useful info for mod_status ;)

Add some __attribute__ for automatic format checking.
Correct one catch in sed0.c.

Correct some spelling.

Replace strdup by ap_malloc to ensure a proper error message if out-of-memory.
While there, only allocate memory for the string part we actually use.

PR: 54345

Exit with error message if out of mem

htdbm, htpasswd: print error message if out of memory

PR: 54345

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

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

promote

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

Merge r1429559, r1451484 from trunk:

According top my testing 'SSL_SESSION_id2sz' is 4x faster with the use 'ap_bin2hex' instead of
apr_snprintf(..., "%02X" for each character.
Output is the same.

I have left the uppercase conversion, because I'm unsure if it is usefull or not.

SSL_SESSION_id2sz is only used for logging, having it in lowercase shouldn't be an issue.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1429564 from trunk:

Use ap_bin2hex instead of sprintf(..., "%02x". It gives the same output and is faster.

No real speedup should be achieved on production machine, because this is done
only for characters that need to be escaped.
However, this will close PR 50919.

Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1429582 from trunk:

According to my testing, one special case of 'log_xlate_error', i.e. EES_INCOMPLETE_CHAR,
 is 13x (!!!) faster with the use 'ap_bin2hex' instead of apr_snprintf(..., "%02X" + srlen for each character.

Output is *not* exactly the same. It was uppercase, now it is lowercase.
It is just for logging, so I don't think it is an issue.
Should it be, a call to ap_strtoupper can be added.

So sad it is just for logging in case of error... no real speedup to be expected in real life .

Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1429561 from trunk:

According top my testing 'socache_mc_id2key' is 6x faster with the use 'ap_bin2hex' instead of
apr_snprintf(..., "%02X" for each character.
Output is *not* exactly the same. It was uppercase, now it is lowercase.

According to my understanding, this is not an issue.
Should it be, a call to ap_str_toupper should be added.

The speedup would be less, but still significant.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1439623 from trunk:

Fix error because of negative rate-limit
PR : 52964
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1364695 from trunk:

mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.

Submitted by: trawick
Reviewed/backported by: jim

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

ipromote

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

It was a busy weekend

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

Merge r1435811 from trunk:

Add "mod_macro" as a standard module, compiled in with "most".

This module was created in 1998 and has been distributed independently
ever since. It is hereby donated to the Apache Software Foundation.

There are quite a few comments in the source code to explain how it works,
as well as extensive non regression tests.

Some utilities about array processing could be moved to "core.c".
However, I finally decided against for now so that it stays as an external
and independent module, and thus may be backported with minimal impact
on the source tree.

Details of the addition:

* modules/core/mod_macro.c: module source code
* modules/core/test: non regression tests
  modules/core/test/conf/: configuration files
  modules/core/test/ref/: expected results
* docs/manual/mod/mod_macro.xml: English documentation
* docs/manual/mod/mod_macro.xml.fr: French documentation

Submitted by: fabien
Reviewed/backported by: jim

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

vote, comment

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

some votes

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

vote + promote

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

some votes.

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

Update.

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

2.4.x needs mod_macro :)

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

Propose

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

propose

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

Use the same word as in the syntax below.

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

Typo (already OK on trunk)

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

xforms

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

Merge r1452865 from trunk:

for now, mention that the TTL isn't tracking to the last I/O on the LDAP conn.

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

Updating .fr translation to the latest .en revision

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

[2.4][doc]Adding french translation for a number of modules

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

Use define for serverroot with NetWare conf files.
(Backport r1451155)

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

xforms

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

Merge r1425975 from trunk:

Add notes about compiling from Unix sources

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

Updates.

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

Some windows install.log output cosmetics.

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

Propose

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

2 more proposals to close this serie

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

Propose

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

fix the wording of a line, as per comment 909 on the site.

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

this is broken... veto and pull out

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

2 proposals

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

backport overflow css fix

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

Update to be consistent with the rest of the document

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

Backport some small documentation tweeks from trunk.

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

xforms

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

fix various typos, thanks to mike rumph as per comment #872

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

Backport r1449479 from trunk.
mod_include: Use new ap_expr for 'elif'. [PR 54548]

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