Merge r1364229 from trunk:

Correctly log the error returned by apr_dbd_pvselect()

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1371878 from trunk:

Apache does not tolerate deliberate abuse of open standards

Submitted by: fielding
Reviewed/backported by: jim

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

Merge r1364133, r1371791 from trunk:

When -B is specified, search for a host address in the
same family as the specified outbound interface.  If
impossible, fail at name resolution instead of bind().

ab: Fix read failure when targeting SSL server.

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1371387 from trunk:

mod_auth_digest now respects DefaultRuntimeDir
Submitted by: trawick
Reviewed/backported by: jim

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

Promote

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

Vote on patches

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

normal vote/promote stuff

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

Add a missing paren

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

xforms

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

grammar fix

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

Update proposal *blames niq*

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

htpasswd: Use correct file mode for checking if file is writable.
Also switch to the non-deprecated APR_FOPEN_* flags.
PR: 45923

Backport of r1369618 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick, humbedooh
Backported by: rjung

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

mpm_winnt: Tweak a message added in r750567 so that the accept thread
logs the physical address it listens on instead of hostname|*.

Backport of r1364138 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

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

Axe unnecessary trailing comma from server-status user output.

Backport of r1369904 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

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

Update proposal. I haven't had coffee yet - that must be why.

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

Promote

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

Vote

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

Propose

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

awesome beach day

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

vote

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

votes

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

Add a round of very easy to review backport proposals.
Also add the revision numbers related to DefaultRuntimeDir.

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

Comment spelling fix.

CTR

Backport of r1368131 from trunk.

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

Comment

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

bad header doxygen: ap_rflush does not return the number
of bytes flushed, it returns 0 on success, -1 on error.

Should be CTR.

Backport of rr1368393 and r1368396 from trunk.

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

Add comment to DNT suggestion.

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

Vote, comment.

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

xforms

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

Fix typo/syntax error in docs.

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

Fix mod_headers documentation:
- add expr= to syntax rule
- add optional replacement argument to Header syntax
- add "edit*" command to Header syntax
- add "edit*" explanation to Header directive

Backport of r1371903 from trunk.

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

Revisions r1370592,1370615-1370616 have been backported
in r1371164.

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

the sun is rising over Mars

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

it is way too hot for 1am

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

(SSL failures on Windows with AcceptFilter https none)?

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

ab fixes

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

remove a non-controversial concept vote, replace with a real example

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

xforms

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

Remove reference to the iPlanet SDK, as it doesn't seem to exist anymore

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

Update links that were either broken of just slightly off

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

Committed revision 1371208

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

Merge r1369995, r1369999, r1370001 from trunk:

Use apr_pcalloc for rewritemap_entry struct, to avoid uninitialized entries.

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

remove now unecessary assignment

Add changes entry for r1369995, r1369999

Submitted by: sf
Reviewed/backported by: jim

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

promote patch

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

Votes on prposals

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

NetWare build tweaks.
mwccnlm: search directory of referencing file first for #includes.
(backport r1370592, 1370615)
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.
(backport 1370616)

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

Added new symbol introduced with r1366693.

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

xforms

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

typo fixes

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

typo fix

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

conceptual proposals

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

grab r1370907 from trunk:

fix subversion project URL

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

xforms

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

grab 1370764 from trunk:

fix broken module identifiers

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

Vote.

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

xforms

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

fix grammar and remove some scopes within which some directives do not work

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

Update proposal

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

propose, comment

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

Update.

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

Push out

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

Update proposal

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

Fix proposal

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

Comment.

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

xforms

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

clarify that the 2.4 pidfile APIs process paths relative to ServerRoot

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

Propose + vote

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

Up to date with .en version of the document.

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

Fixing link as reported by Louise Hope @ http://httpd.apache.org/docs/2.2/howto/htaccess.html#comment_184

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

Fix revision number in backport proposal.

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

Propose + vote

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

Adding new .fr translation for mod_session documentation.

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

merge r1364709 from trunk:

doc fixes for r1299718:

The value of ScriptSock is relative to DefaultRuntimeDir.

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

mod_ssl: Add new directive SSLCompression to disable
TLS-level compression.

PR 53219.

Backport of r1345319 and r1348656 from trunk.

Submitted by: Bjoern Jacke <bjoern j3e de>, sf
Reviewed by: rjung, trawick
Backported by: rjung

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

Merge r1369568 from trunk:

bytes is not a unit of filename

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

SSLCompression directive approved

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

Big mod_lua backport:

r1201460: Add some todos from apachecon notes.
          Submitted by: covener

r1351012: Change prototype of vm_construct, to work around gcc bug which
          causes a segfault.  PR: 52779
          Submitted by: Dick Snippe <Dick Snippe tech omroep nl>

r1351013: Allow tail call optimization in log methods, remove foo method.
          Submitted by: sf

r1351014: Add a few missing request_rec fields. Rename remote_ip to
          client_ip to match conn_rec.
          Submitted by: sf

r1351017: Change various strings from char * to const char *.
          Submitted by: sf

r1351018: Factor common code into utility function.
          Also improve logging a bit and adjust some log levels.
          Submitted by: sf

r1351019: Use macro to make definition of integer fields more compact.
          Submitted by: sf

Reviewed by: humbedooh, covener, sf
Backported by: humbedooh, rjung

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

MPM event:
- Keep track of the number of clogged, lingering, and suspended connections.
- Don't count connections in lingering close state when calculating
  how many additional connections may be accepted

Backport of r1361773 and r 1361778 from trunk.

Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung

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

mod_ssl: Pass the server_rec to ssl_die() and use it to log a message to
the main error log, pointing to the appropriate virtual host error log.

Backport of r1348660 from trunk.

Submitted by: sf
Reviewed by: rjung, covener
Backported by: rjung

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

grab r1369435 from trunk:

fix documented default value of ScoreBoardFile

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

grab r1369300 and 1369431 from trunk:

mention migration from ap_requires() and to ap_runtime_dir_relative()

fix formatting of DEFAULT_REL_RUNTIMEDIR

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

Merge r1369419:

r1364253  added and include to mod_ssl.h
Show the compiler where to find it

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

revert r1369191

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

vote & promote

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

+1 for lua resynch

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

r1364253 forces the build to find mod_ssl.h
This should be CTR, feel free to revert if you do
not like this way of finding the required header.

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

merged

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

Merge r1366319 from trunk:

ap_str(case)cmp_match returns the opposite of what is advertized in the header.
Submitted by: humbedooh
Reviewed/backported by: jim

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

Merge r1361766 from trunk:

Simplify handling of MaxConnectionsPerChild

If we decrement the counter at accept time and not at close time,
we only need to access the counter in the listener thread and the
code gets much simpler.

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1351016 from trunk:

pass the provider name to parse_require_line as pool userdata

This allows a single C function to implement several authz providers.

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1334343 from trunk:

Use short lived pool to avoid memory leaks

Remove the comment about binding upstream and downstream connections. It
seems to be obsolete since r104604, r104605, r105108.

Also avoid allocating memory if we are not handling the connection.

PR: 52275
Submitted by: Naohiro Ooiwa <naohiro ooiwa miraclelinux com>, Stefan Fritsch

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1324760 from trunk:

Your APR does not include SSL/EVP support. Yes, but how do I enable it? --with-crypto
Submitted by: igalic
Reviewed/backported by: jim

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

Merge r1242798 from trunk:

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
  Treat EAGAIN as an error for a blocking read from the input filter
  stack.

Submitted by: jorton
Reviewed/backported by: jim

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

promotion

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

Votes

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

Propose sync of sf's fixes/refactoring in mod_lua, so we can get the ball rolling on the rest of the changes.

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

xforms.

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

Remove anchor with dublicate id.

Backport of r1368094 from trunk.

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

Complete docs metadata (sourcefile and identifier)
for mod_unixd and mod_privileges.

Backport of r1368058 from trunk.

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

Add a docs link to a configuration example.

Backport of r1368053 from trunk.

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

Dropping the LuaCodeCache proposal until we get the rest of the backports sorted out (tba).

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

xforms

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