+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

Fix an XML bug in the french translation of mod_proxy_html

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

add a missing </p>

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

Change the external reference to mod_proxy_html to an internal one.

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

Fix typo in docs
(miscomception ->misconception)

Backport of r1367778 from trunk.

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

xforms

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

Remove [max|min max] from the LuaScope syntax, since the 'server' scope is not implemented yet.
Add the 'thread' value to the list of possible scopes

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

some votes

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

Propose (see note in diff)

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

correct mis-vote in r1366668

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

Vote

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

Another easy backport. Only header correction,
probably even CTR?

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

Add merge info for r1363908 (r1363186).

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

Add mergeinfo for r1365604 (1365479)
and r1366693 (1365001, 1365020, 1365029).

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

Add some backport proposals. Most of them pretty
small and easy to review.

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

xforms

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

LuaQuickHandler had no syntax, which made the reference sheet look wrong.

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

Comment out LuaCodeCache, which hasn't been implemented yet.

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

   * mod_proxy*: ProxyBlock fixes; PR 43697 and more.
        trunk patch: http://svn.apache.org/viewvc?rev=1365001&view=rev and
                          http://svn.apache.org/viewvc?rev=1365020&view=rev and
                                            http://svn.apache.org/viewvc?rev=1365029&view=rev
                                                 2.4.x patch: http://people.apache.org/~jorton/ap_proxyblock-24x-v2.diff [avoids major MMN bump]
                                                      +1: jorton, rjung, jim

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

Merge r1366344 from trunk:

mod_proxy_balancer: Restore balancing after a failed worker has
recovered when using lbmethod_bybusyness.

PR: 48735

Markus Stoll and Adam C both submitted patches against 2.2.x
to bug 48735.  Compared with those two, this solution

1. resets the busy field in the error-ed worker at the end of
   the request instead of at recovery time
2. leaves the lbstatus field alone
3. covers all possible scenarios where the busy field in the
   error-ed worker needs to be adjusted, since a cleanup to
   perform the decrement is registered at the point of the
   increment

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1366621 from trunk:

LUA_COMPAT_ALL should be defined _before_ including lua headers
Submitted by: humbedooh
Reviewed/backported by: jim

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

Promote

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

Votes on proposals

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

quick votes

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

Propose

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

this is one way to get eyes on a patch...

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

mod_setenvif: Compile the regex used by is_header_regex() only once
during startup This should save some memory, especially with .htaccess

Backport of r1343099.

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@1365774 13f79535-47bb-0310-9956-ffa450edef68

Add the port number to the vhost's name in scoreboard.

Backport of r1294358 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@1365753 13f79535-47bb-0310-9956-ffa450edef68

Remove historic comment.

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

vote

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

Vote + promote

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

r1365479 done.

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

Merge r1365479 from trunk:

* modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Fix
  to skip balancer:// prefix where applicable.

Reviewed by: jorton, jim, rjung
PR: 45434 (regressed since 2.2)

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

Fixes for proxyblock patch - thanks to rjung.

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

Vote, comment.

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

Merge r1352047, r1361298 from trunk:

Add the missing parsebody function to mod_lua, for parsing POST data.
PR 53064.

- Define LUA_COMPAT_ALL so mod_lua will be compatible with Lua 5.2
- Add an optional integer argument for parsebody, specifying the maximum size of POST that will be accepted.
Submitted by: humbedooh
Reviewed/backported by: jim

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

   * apxs: Make apxs use LDFLAGS from config_vars.mk in addition to
        CFLAGS and CPPFLAGS.
        trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343094
        2.4.x patch: trunk patch works
        +1: rjung, humbedooh, jim

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

   * .gdbinit: improve dump_allocator, add dump_one_pool.
        trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352909
        2.4.x patch: trunk patch works
        +1: rjung, jorton, jim

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

   * htpasswd: Note more prominently that SHA and crypt are insecure.
        trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352910
        2.4.x patch: trunk patch works
        +1: rjung, humbedooh, jim

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

promote

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

votes

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

Propose r1365479.

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

xforms

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

Remove reference to the 'server' value in LuaScope, since it doesn't exist.

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

Adding .fr translation for mod_proxy_html documentation

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

Adding french translation for mod_proxy_fcgi documentation.

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

Nominate ProxyBlock fixes.#

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

mpm_event, mpm_worker: Remain active amidst prevalent child process
resource shortages.

Submitted by: trawick
Reviewed by: jorton, rjung, jim

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

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

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

Encourage best practice in Perl scripts (use strict, warnings).

Backport of r1335882 and r1325724 from trunk.

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

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

Update mergeinfo:
Trunk Rev Backport Rev
1294349   1364611
1294356   1364613
1306350   1364599
1306426   1364600
1306841   1364600
1332378   1364603
1345329   1364602
1357685   1364606
1361792   1364598
1363035   1364608
1363183   1364607
1363440   1364609

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

Vote for backport of Perl script enhancements.

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

Honor DefaultRuntimeDir for mutexes, socache and CGID socket.
Move away from DEFAULT_REL_RUNTIMEDIR and use
ap_runtime_dir_relative() API.

Backport of r1299718 from trunk.

Submitted by: jim
Reviwed by: rjung, trawick
Backported by: rjung

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

Vote.

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

Backports*2.

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

Merge r1327689 from trunk:

For a local variable in a macro, use a name that is less likely to clash
with other variable names.

Submitted by: sf
Reviewed by: rjung, humbedooh, jorton

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

Merge r1361803 from trunk:

Code clean up (remove useless memory allocation)

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52648
Reviewed by: rjung, jim, jorton

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

More votes.

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

Backports*3.

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

Merge r1352534 from trunk:

* modules/cache/cache_util.c (write_write_order): Remove redundant
  double assignment, caught by Coverity.  No functional change.

Reviewed by: rjung, humbedooh, jorton

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

Merge r1341906, r1341913 from trunk:

* acinclude.m4: Use AC_MSG_NOTICE.

* configure.in: Use AC_MSG_NOTICE so passing --silent works as advertised.

Reviewed by: rjung, humbedooh, jorton

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

Merge r1351737 from trunk:

* support/ab.c (test, start_connect): Only bind the local end of the
  socket (and look up an address for it) if -B is specified.

Reviewed by: trawick, rjung, jorton

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

Votes.

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

vote/promote support for DefaultRuntimeDir for a handful of modules

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

Merge r1294356 from trunk:

Take care not to call ap_start_lingering_close from the listener thread,
because it may block when flushing data to the client.

From the listener thread, do a lingering close without flushing. This is
OK because we only do this if there has been an error during write
completion or if our send buffers are empty because we are in keep-alive.

PR: 52229

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1294349 from trunk:

Prevent listener thread from ever updating a worker's scoreboard slot

The worker may be doing something else by now. This should take
care of slots staying in "L" state in the scoreboard

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1363440 from trunk:

mpm_event, mpm_worker: Fix cases where the spawn rate wasn't reduced
after child process resource shortages.

The broken scenario:

  child X exits with APEXIT_CHILDSICK
  another child Y is created and reuses child X's scoreboard slot
  child X's exit status is processed

The case that worked is when child X's scoreboard slot hadn't
been reused by the time that its exit status was processed.

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1363035 from trunk:

avoid decls for some Unix-specific functions on Win32 too

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1363183 from trunk:

fix child exit status in prefork after certain errors in
the child so that the parent resets the spawn rate to the
minimum

or:

mpm_prefork: Reduce spawn rate after a child process exits due to
unexpected poll or accept failure.

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1357685 from trunk:

* modules/filters/mod_ext_filter.c (ef_unified_filter): Set hit_eos
  flag on hitting EOS.
  (ef_input_filter): Give back EOS if filter is invoked after hitting
  EOS, rather than attempting (and failing) to read from the closed
  pipe to the child.

Submitted by: jorton
Reviewed/backported by: jim

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

update r136355 backport request with follow-on fixes pointed out
by rjung

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

Merge r1332378 from trunk:

If a filename without slashes is specified for LoadFile or
LoadModule and the file cannot be found in the server root directory,
try to use the standard dlopen() search path.

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1345329 from trunk:

remove obsolete comment (PROXY_MAGIC_TYPE is not used anywhere anymore)

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1306426, r1306841 from trunk:

Update worker mpm defaults to match documentation and built-in defaults.
As per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102

Updated event mpm configuration to match the defaults in documentation and header definitions.
Updated prefork defaults to better match documentation and header definition.
Submitted by: humbedooh
Reviewed/backported by: jim

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

Merge r1306350 from trunk:

Adapt Timeout to be the same as DEFAULT_TIMEOUT.
After all it's localted in a file called extra/httpd-default.conf

Submitted by: igalic
Reviewed/backported by: jim

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

Merge r1361792 from trunk:

Remove some checking for out-of-mem conditions that cannot be hit
because apr_pcalloc/apr_pool_create will call abort() anyway.

Submitted by: sf
Reviewed/backported by: jim

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

promote

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

Votes

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

Vote

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

Add mergeinfo for committs backported in revisions:
r1309579, r1331413, r1203645, r1201445,
r1200983, r1200982.

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

xforms

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

typo fixes

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