some votes

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

Put in a placeholder

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

Not really needed to backport

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

* Add a proposal

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

* Add a proposal

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

merged patch

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

Resolves comment about how regex matches, at
http://httpd.apache.org/docs/current/mod/mod_rewrite.html#comments_thread

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

Fix weird indentation

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

Rebuild All The Things.

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

mod_rewrite doc enhancements from trunk.

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

Backporting documentation changes from trunk related to mod_cgi/cgid and mod_deflate

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

Rebuild.

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

XML updates.

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

xforms

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

Fix examples

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

xforms

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

Take into account an old comment from Thomas.
Add an example using regex

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

xforms

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

Small visual tweak

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

xforms

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

Fix doc as spotted by Shane Roberts in online doc
+ synch with trunk

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

Fix proposal, restart vote.
Thanks Stefan.

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

adding missing change for APLOGNO

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

proposing backport of pre_close_connection hook

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

regresssions as test parse debug log

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

disable any openssl use until configure fix is backported, linking gets messed up when multiple places have openssl

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

vote

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

vote

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

Backport proposal

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

proposing APACHE_CHECK_OPENSSL twice invocation fix for backport

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

backport of r1718514,1721313

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

missed author

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

vote

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

backport of r1723122,1723143

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

vote

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

Some backport votes

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

make docs

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

Merge r1727317 from trunk:

Update Perl FCGI examples to work with current version of module

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

Proposal

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

xforms

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

Fix typo spotted by noodl  in online doc + synch with trunk

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

mod_http2: merge r1726798 from trunk.
Fix warnings:
modules/http2/h2_util.c|174| warning: suggest parentheses around ‘+’ in operand of ‘&’
modules/http2/h2_util.c|176| warning: suggest parentheses around ‘+’ in operand of ‘&’

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

Rebuild.

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

XML updates.

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

per ML feedback, make setHandler expression interp
implicit.

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

Fix typo in comment (s/patterm/pattern/).

Backport of r1726086 from trunk.

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

Fix typo in comment

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

votes

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

Merge r1724857 from trunk:

  *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075,
     "Error dispatching request", when the cause appears to be
     the client closing the connection.

PR58118.

Submitted By: Tobias Adolph <adolph lrz.de>
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@1726019 13f79535-47bb-0310-9956-ffa450edef68

Merge r1724847, r1725516 from trunk:

flush errors are TRACE1 in the core output filter now.

Remove APLOGNO after moving log message to
TRACE1 in r1724847.

Submitted by: covener, rjung
Reviewed/backported by: jim

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

Merge r1724656 from trunk:

  *) mod_rewrite: Avoid looping on relative substitutions that
     result in the same filename we started with. PR 58854.
     [Eric Covener]

Previously, the comparison of old and new filename happened before
some prefixes might be added.

Submitted by: covener
Reviewed/backported by: jim

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

propsing ssl timeout fix

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

prep

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

Propose.

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

Promote.

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

Vote

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

Merge r1723567 from trunk:

Add common extension "m4a" for MPEG 4 Audio to
mime.types.

As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

PR: 57895

Submitted by: rjung
Reviewed/backported by: jim

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

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