For your consideration;

  the following CHANGES entries do not occur in the APACHE_2_0_BRANCH
  CHANGES file.  If you already committed them, please reflect in both
  CHANGES files.  If you would like to commit them, please do so, and
  then reflect the patches under Apache 2.0.44.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97701 13f79535-47bb-0310-9956-ffa450edef68

functions.  This allows modules to register different versions of the
same provider.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97696 13f79535-47bb-0310-9956-ffa450edef68

  Reflect that AAA overhaul is deferrred.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97695 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97678 13f79535-47bb-0310-9956-ffa450edef68

  Changes committed - and set aside a placeholder for 2.1 patches.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97651 13f79535-47bb-0310-9956-ffa450edef68

contains '='.

PR:              13914
Submitted by:	 Ville Skytt� <ville.skytta@iki.fi> (mod_cgi)
                 Jeff Trawick (mod_cgid)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97601 13f79535-47bb-0310-9956-ffa450edef68

as set by apr-util in util_ldap.c. This should allow mod_ldap
to work with the Netscape/Mozilla LDAP library.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97600 13f79535-47bb-0310-9956-ffa450edef68

PR:               14256


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97599 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97598 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97597 13f79535-47bb-0310-9956-ffa450edef68

implementation which broke IPv4 listening sockets on
systems with IPV6_V6ONLY socket option.

That option should only be done on IPv6 listening sockets.

Submitted by:	hiroyuki hanai <hanai@imgsrc.co.jp>]
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97595 13f79535-47bb-0310-9956-ffa450edef68

now work as in Apache 1.3, where no trailing '/' is
specified on the directory name.  Previously, the trailing
'/' *had* to be specified, which was incompatible with
Apache 1.3.

PR:       7990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97590 13f79535-47bb-0310-9956-ffa450edef68

Fix for PR 14556. The expiry calculations in mod_cache were
trying to perform "now + ((date - lastmod) * factor)" where
date == lastmod resulting in "now + 0". The code now follows
the else path (using the default expiration) if date is
equal to lastmod. [rx@armstrike.com (Sergey), Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97589 13f79535-47bb-0310-9956-ffa450edef68

default calling convention is not the same as the one used by
AP_DECLARE.

Submitted by:	  Juan Rivera <Juan.Rivera@citrix.com>
Reviewed by:	  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97565 13f79535-47bb-0310-9956-ffa450edef68

and any other hop-by-hop headers that shouldn't be applied when the
response is later delivered from cache:
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=103727389213072
Diagnosed by: Estrade Matthieu <estrade-m@ifrance.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97542 13f79535-47bb-0310-9956-ffa450edef68

Communication between handler and daemon used newlines to delimit
environment variables, which threw everything off when an environment
variable contained a newline.

Communication between handler and daemon was extensively reworked.
Environment variables were handled as in the patch submitted by
Piotr Czejkowski.

PR:              14550
Submitted by:	 Piotr Czejkowski <apache@czarny.eu.org>, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97530 13f79535-47bb-0310-9956-ffa450edef68

See Attic in experimental directory for previous change history.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97527 13f79535-47bb-0310-9956-ffa450edef68

brigade was being destroyed (ie, cleanup unregistered) rather than just
emptied out and then reused anyway, the last call down the filter stack
would leak buckets.

PR: 14321
Submitted by:	Ken Franken <kfranken@decisionmark.com>
Reviewed by:	Jeff Trawick, Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97526 13f79535-47bb-0310-9956-ffa450edef68

whether or not Apache expects to handle IPv4 connections
on IPv6 listening sockets.  Either setting will work on
systems with the IPV6_V6ONLY socket option.  --enable-v4-mapped
must be used on systems that always allow IPv4 connections on
IPv6 listening sockets.

Note: As the ssl config file is not automatically generated and
      it is expected to require editing anyway to work, the only
      change there was to suggest the required Listen statements
      in a comment.

PR:   PR 14037 (Bugzilla), PR 7492 (Gnats), various dups of these PRs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97516 13f79535-47bb-0310-9956-ffa450edef68

This fixes a problem where the underlying cache code
indicated that there was one more element on the cache
than there actually was. This happened since element 0
exists but is not used. This code allocates the correct
number of useable elements and reports the number of
actually used elements. The previous code only allowed
MCacheMaxObjectCount-1 objects to be stored in the
cache. [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97510 13f79535-47bb-0310-9956-ffa450edef68

	to allow conditional setting according to the IP address on
	which the server received the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97494 13f79535-47bb-0310-9956-ffa450edef68

drops.

This is done by mod_cgid daemon remembering the pid, which is queried
by the handler at the end of the request.  The handler then
knocks out the CGI script (if it is indeed still running).

It would be slightly easier for the daemon to do this, but naughty
scripts which are hard to kill would hold up all new CGI requests
if the daemon stopped its normal processing to kill a script.

PR:		8388


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97489 13f79535-47bb-0310-9956-ffa450edef68

redirection on crypto accelerator.

Submitted by:     Frederic DONNAT <frederic.donnat@zencod.com>
Reviewed by:	  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97482 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97474 13f79535-47bb-0310-9956-ffa450edef68

Submitted by:	Andr��Malo <nd@perlig.de>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97473 13f79535-47bb-0310-9956-ffa450edef68

  Note progress.  Lots of helpers out there emailing their feedback,
  which is great.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97469 13f79535-47bb-0310-9956-ffa450edef68

Improves the user friendliness of the CacheRoot processing
over my last pass. This version avoids the pool allocations
but doesn't avoid all of the runtime checks. It no longer
terminates during post-config processing. An error is logged
once per worker, indicating that the CacheRoot needs to be set.
[Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97466 13f79535-47bb-0310-9956-ffa450edef68

after writing the data to the network.  This closes files sooner with
keepalive connections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97462 13f79535-47bb-0310-9956-ffa450edef68

a POSTed request, don't send the original POST's Content-Length
as part of the header for the GET.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97455 13f79535-47bb-0310-9956-ffa450edef68

Added code to process min and max file size directives and to
init the expirychk flag in mod_disk_cache. Added a clarifying
comment to cache_util.   [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97450 13f79535-47bb-0310-9956-ffa450edef68

controlled by ServerTokens.

Submitted by:	Francis Daly <deva@daoine.org>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97416 13f79535-47bb-0310-9956-ffa450edef68

  Completely refactor the BIO-side client input handling for the SSL library.
  Should eliminate many false spurious interrupt detected errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97367 13f79535-47bb-0310-9956-ffa450edef68

fix only applies to some normal paths in mod_cgi.  mod_cgid
is still busted.

A prereq for this fix is the change to content-length filter to
notice c->aborted:

http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protoc
ol.c.diff?r1=1.119&r2=1.120&diff_format=h

PR:         8388


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97364 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97359 13f79535-47bb-0310-9956-ffa450edef68

  Fix memory leak in mod_ssl from internal SSL library allocations
  within SSL_get_peer_certificate and X509_get_pubkey.

Submitted by:	Zvi Har'El <rl@math.technion.ac.il>
Reviewed by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97344 13f79535-47bb-0310-9956-ffa450edef68

memory which has been previously allocated inside OpenSSL.
Such memory should be freed with OPENSSL_free(), not with free().

Submitted by: Nadav Har'El <nyh@math.technion.ac.il>,
              Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97307 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97302 13f79535-47bb-0310-9956-ffa450edef68

works.

core output filter needs to detect when no more data is available from
a pipe for a while so that it can flush what is already there

normally, content-length filter handles this but for nph- script
we don't have content-length filter in place

PR:             8482


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97301 13f79535-47bb-0310-9956-ffa450edef68

call in the core_output_filter, in order to get a more accurate count
of the total bytes transmitted in cases where the client terminates
the connection before the entire response is sent.

Note: This works by adding a flush bucket to each response when
mod_logio is used; the side-effect is that pipelined responses
get broken up into separate network writes per request (but there's
no impact on pipelining when mod_logio is not enabled).

Submitted by:	Bojan Smojver <bojan@rexursive.com>
Reviewed by:	Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97300 13f79535-47bb-0310-9956-ffa450edef68

apr_socket_t ptr filled in by apr_os_sock_put() needs to be NULL on
entry to have a new structure allocated

various iov problems were fixed

Submitted by:  Jonas Eriksson <jonas@webkonsulterna.com>
Reviewed by:   Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97299 13f79535-47bb-0310-9956-ffa450edef68