Merge r1719257 from trunk:

Do not use the magic string "directory". Use the corresponding global variable as in all other places of the module.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1719252, r1719254, r1719255, r1720996 from trunk:

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1719018, r1719189, r1719190 from trunk:

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Fix some minor style issue.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1719016 from trunk:

There is no need to duplicate some memory  here, the 'path' given to ap_parse_htaccess is never modified.
Submitted by: jailletc36
Reviewed/backported by: jim

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

promote

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

votes

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

updated changes after mod_http2 backport from trunk

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

no check for openssl until fix from trunk is backported

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

mod_http2 v1.2.2 from trunk

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

sethandler expr=backport

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

Merge r1725106 from trunk:

clarify a butchered sentence about missing ServerName, which
is a regular early step in "my directive didn't do anything".

This describes ap_get_local_host()

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

Merge r1725102 from trunk:

update syntax to allow for non-FQDN domains or IP addresses in ServerName.

Since UseCanonicalName defaults to OFF, name-based vhosts isn't really an
"additional" purpose of a ServerName. Also update the syntax to not insist
on an FQDN -- generally the ServerName needs to be something the client
and server can both resolve, but it's not required to be an FQDN or even
a domain name.

Leave the example as www.example.com

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

another pass of votes

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

two quick proposals for flush error severity

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

add rewrite fix, vote

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

rebuild

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

Distinguish between 'deflate' and 'gzip' encoding.

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

rebuild

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

Applying Luca's patch from bz 58744

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

XML update.

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

re-build

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

Fix doc as spotted by A. Gh.  in online doc

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

Rebuild.

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

XML update.

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

Propose.

Although mime.types as part of conf is underneath
"docs", it is probably safer to vote on it and not
rely on CTR for documentation.

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

Propose.

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

Happy new year to all :)

Here are a few easy proposals to synch 2.4 and trunk

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

Fix compatibiliy note for the GlobalLog directive
(r1722703 in trunk)

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

Rebuild.

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

XML updates.

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

update transformations

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

fixed typo

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

Update XForms.

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

Happy New Year 2016

Backport of r1722572 from trunk.

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

xforms

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

Merge r1599535, r1721685 from trunk:

add GlobalLog directive to allow a diagnostic log to be inherited
by all virtual hosts, even if they define their own logs.

Submitted By: Edward Lu <Chaosed0 gmail.com>
Committed by: covener

document GlobalLog

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1722137 from trunk:

Don't allow bad value to be updated

Reviewed/backported by: jim

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

Vote, promote.

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

vote baby!

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

Merge r1715255 from trunk:
Reviewed/backported by: jim

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

Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r1715582, r1715583, r1715584, r1715585 from trunk:

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.
Add a blank line between functions.

Remove some useless 'return' statements.
Fix style and alignment.

Remove some useless 'return' statements.
Fix style.

Remove some useless 'return' statements.
Add a blank line between functions.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1719967 from trunk:

mod_ssl: fix build with openssl < 0.9.8m (missing semicolon).
Reported by: Petr Gajdos <pgajdos suse.cz>
Submitted by: ylavic
Reviewed/backported by: jim

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

vote/promote

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

propose GlobalLog since it was requested in a user PR.

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

backport req.

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

* Vote

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

Merge r1721978 from trunk:

add a mod_headers condition clause expression example

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

Merge r1721975 from trunk:

PR58764: python example for sha1 password hashes

Submitted By: Dave Hall <skwashd gmail.com>

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

Merge r1721973 from trunk:

PR58761: developer doc improvements.

Submitted By: Luca Toscano

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

Rebuild

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

Formatting of example

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

Propose.

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

CHANGES: move entry to the right/effective version.
r1715014 somehow put it in 2.4.17, whereas it was really backported in 2.4.18.

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

Yup, doh - and rebutt a non-starter

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

Vote and comment on trivial mod_ssl fix.

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

Propose r1720129

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

Propose trivial (build) fix for mod_ssl with openssl < 0.9.8m.

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

Rebuild.

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

XML updates.

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

And we are 2.4.19-dev

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

Get ready to tag 2.4.18

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

Add an alert for module developers that this subset (specifically,
only the recently added 2.4.17 Protocol API's) may still be in flux,
until the group has concensus on the API behavior.

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

merge from trunk:removing HTTP_HEADER output filter on upgraded connections, so timeouts do not send http/1.1 responses any more

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

Comment about ap_request_has_body() check for Upgrade.

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

vote

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

Merge r1718569 from trunk.

h2_from_h1: To avoid any further confusion, r->err_headers should be cleared
once merged into r->headers_out.

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

mod_http2: merged from trunk, sending out push promises *before* the stream response to make client handling of preload links easier

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

Better explain what this patch does and doesn't do

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

xforms

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

Generated doc changes

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

merged H2PushPriority befiore 'weight' loss from trunk

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

mod_http v1.0.11, fixes duplicate response headers when post_req_hook gets invoked twice

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

Merge r1715273 from trunk:

Save a few bytes in conf pool.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1716940, r1717086 from trunk:

Use 'ap_pbase64decode' to simplify code.

Silent a sparse Warning.

cid->ecb->lpszLogData can not be NULL.
It is defined in mod_isapi.h as:
typedef struct EXTENSION_CONTROL_BLOCK {
...
    char           lpszLogData[80];
...
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1717958 from trunk:

using c->master for ssl var lookups when c holds no valid SSLConnRec. Fixes PR58666.
Submitted by: icing
Reviewed/backported by: jim

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

promotes

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

votes

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

Merge r1717063 from trunk:

Fix the use of the default 'flush' provider.
Improve documentation for the "flusher" parameter.
Remove useless empty lines.

See http://mail-archives.apache.org/mod_mbox/httpd-dev/200812.mbox/%3C494226C0.4050407@force-elite.com%3E for some more explanation.
A python script is given there to test.
I had to tweak it to have it work
(use:
        fd, payload = passfd.recvfd(conn.fileno())
instead of:
        fd = passfd.recvfd(conn.fileno())
)

This is a r1058621 regression, where somehow "char *flusher" has been turned into a "char flusher[]". So it is been broken since the beginning of 2.4.x

After this change (i.e. r1058621), 'flusher' is no more a pointer (NULL'ed when the structure it belongs to is created) but the address of an array within a structure. It can not be NULL anymore.
So, we now have to look at the content of the array itself to see if it has been initialized or if we have to use the default value instead.
Submitted by: jailletc36
Reviewed/backported by: jim

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

mod_http2: version bump, merge of authority default port handling for upgraded requests

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

Vote, promote.

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

update transformation

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

Easy proposals

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

Straightforward, good catch

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

XML update.

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

XML update.

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

Put proposal in the right section

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

merging floor() removal from trunk

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

v1.0.10 of mod_http2 backport, see CHANGES

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

proposing backport of ssl var lookups in c->master

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

Generated doc changes

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

Satisfy XML validation and fix some typos

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

Generated doc changes

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

Typos and grammar corrections

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

Generated doc changes

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

merge of 1717639, fixing WINDOW_UPDATEs on small stream inputs

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

rebuild

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

Fix doc as spotted by mat in online doc

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

Proposal

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

Rebuild.

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