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

- 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

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

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

        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

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

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

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

* 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

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

        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

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

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

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

* 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

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

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

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

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

than just the fixed header name of "Status".

Backport of r1362538 from trunk.

Submitted by: chrisd
Reviewed by: rpluem, rjung
Backported by: rjung


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

when len == 0.

Backport of r1358061 from trunk.

Submitted by: Jim Meyering <meyering redhat.com>
Reviewed by: jorton, trawick, rjung
Backported by: rjung


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

This was broken when the handling of lingering close was moved into the
listener thread.

- Make the connection counting thread safe.
- Do the counting in the connection pool cleanup to ensure that it gets
  also executed if the listener thread closes the connection.
- Add a trace log message when a process is recycled.
- Rename requests_this_child to conns_this_child, which is more accurate

Backport of r1343085 and r1343087.

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


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

references %{REMOTE_USER}, trigger authentication and retry.
Log error if 'Require expr' fails.

PR: 52892

Backport of r1351071, r1351072 and r1351074 from trunk.

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


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

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

Backport of r1352911 from trunk.

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


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

Backport of r1359057 from trunk.

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


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

http://www.iana.org/assignments/http-status-codes/http-status-codes.xml 

The new codes are now known and some canned error
strings are provided. The web server does not yet actually
produce them in responses or reacts on getting them
from an origin server when acting as a proxy or gateway.

Backport of r1361784, r1361791 and 1362020 from trunk.


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

* include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
  with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.

Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: jorton, sf, rjung


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

r1052419 changed the default value of Options to FollowSymlinks, 
but inadvertently made "AllowOverride Options" behave like 
"AllowOverride Options=FollowSymLinks".

PR53444



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

mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.

PR: 53023
Submitted by: Axel Reinhold <apache freakout.de>
Reviewed/Updated by: nd

Submitted by: nd
Reviewed/backported by: jim


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

Fix parsing of Require arguments in <AuthzProviderAlias>.
Add some logging and an assert for a case that should not happen.

PR: 53048

Submitted by: sf
Reviewed/backported by: jim


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

PR 53104 - %{abc}C truncates cookies whose values contain '='

Submitted by: gregames
Reviewed/backported by: jim


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

     trunk patch: http://svn.apache.org/viewvc?rev=1356115&view=rev
                  http://svn.apache.org/viewvc?view=revision&revision=1356813
     2.4.x patch: http://people.apache.org/~jorton/httpd-pr52774.patch
     +1: jorton, covener, druggeri, jim


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

    SECURITY: CVE-2012-2687 (cve.mitre.org):

    mod_negotiation: Escape filenames in variant list to prevent an
    possible XSS for a site where untrusted users can upload files to a
    location with MultiViews enabled.

    * modules/mappers/mod_negotiation.c (make_variant_list): Escape
      filenames in variant list.

    Submitted by: Niels Heinen <heinenn google.com>

Reviewed by: covener, jorton, sf


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

     htdbm/htpasswd: fix handling of crypt() failures.

Reviewed by: jorton, covener, sf


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

    * server/mpm_unix.c (dummy_connection): Use a TLS 1.0 close_notify
      alert if the chosen listener is configured for https; not perfect
      but better than sending an HTTP request.  Adjust comments.


    * server/mpm_unix.c (dummy_connection): Fix spello.

Reviewed by: jorton, jim, covener


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

    Use the the same hostname for SNI as for the HTTP request when forwarding
    to SSL backends.

    PR: 53134
    Based on a patch from: Michael Weiser <michael weiser.dinsnail.net>

Reviewed by: rpluem, druggeri, covener


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

	
	mod_info: Display registered providers.

Reviewed by: sf, jorton, covener


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

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