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

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

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

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

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

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

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

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

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

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

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

* 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

* 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

* 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

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

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

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

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

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

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

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

* 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

by rjung


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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