Merge r280384 from trunk:

Document the ReceiveBufferSize change done in r157583
Submitted by: Murray Nesbitt <murray@cpan.org>

Submitted by: stas

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

Promote some proposed backports to ACCEPTED.

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

Merge r161691 from trunk:

 * mod_deflate should be merging the Vary header, not Setting it, and ignoring
   what other modules put there.

Spotted By: Rici Lake
Submitted by: pquerna

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

Cast an explicit vote on the later mod_cgid on solaris autoconf
patch, to make it clear that there are 3 +1's.

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

Merge r331041 from trunk:

* Fix a null pointer dereference in dav_method_mkcol during the handling of
  errors from dav_auto_checkin.

Submitted by: Ghassan Misherghi <ghassanm ucdavis.edu>
Reviewed by: rpluem

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

Fold in several +1 votes on backports/patches tested on Suse 10.0, Sol8
and OS X. The ones with 3+ +1 votes, and therefore enough to
be committed are:

     *) mod_ssl: Fix issues picking up ssl-unclean-shutdown setting
        for e.g. a reverse proxy config, breaking interop with MSIE
        in some cases.

    *) Block mod_cgid usage on Solaris 10 due to OS bugs.  PR 34264.
       http://svn.apache.org/viewcvs?view=rev&rev=264866

    *) Fix all non-http protocol modules that were modeled after the
       broken mod_echo.c example

    *) mod_proxy: Fix PR37145

    *) mod_cache: Fix PR37347

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

Merge r179622 and r280114 from trunk:

* mod_mime_magic: Handle CRLF-format magic files so that it works with
  the default installation on Windows.

* rewrite CR mitigation logic to wipe out any trailing
  white space

Suggested by: wrowe
Submitted by: trawick

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

Sync the STATUS file with a backport.

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

Fix PR37566: write to the log if the authgroupfile cannot be opened.

Submitted by: rpluem

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

Merge r354394 from trunk:

    * modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Omit further
      access control checks if SSL is not in use regardless of vhost
      settings.

Submitted by: rpluem, jorton

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

Merge r157583 from trunk:

Add ReceiveBufferSize directive to control the TCP receive buffer.

Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  Justin Erenkrantz (with minor formatting tweaks)

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

Merge r180341 from trunk:

    * Fix handling of "Vary: *" in mod_cache.

Submitted by: pquerna

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

Update the CHANGES entry slightly, as "mod_proxy_ftp" doesn't really
make sense in a 2.0.x context.

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

Merge r241044 from trunk:

* Remove the base href tag from mod_proxy_ftp, as it breaks relative
  links for clients not using an Authorization header.

Submitted by: minfrin

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

add vote for fix to CAN-2005-3357

move some approved backports to appropriate section

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

Merge r321500 from trunk:

* modules/http/http_request.c
  (ap_allow_methods): add missing va_end call

Submitted by: nd

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

Update to reflect a backported patch

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

Merge r125495 and r126224 from trunk:

* support/check_forensic: Fix temp file usage

Submitted By: Javier Fernandez-Sanguino Pen~a
Reviewed By: Thom May

* support/check_forensic: Fix script on platforms that do not have either
  mktemp or tempfile (such as Solaris).

Also tested on Darwin & FreeBSD.

Submitted by: jerenkrantz

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

Merge r332986 from trunk:

Add an Irish Translation

Authored by: Noirin
Reviewed by: Colm

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

* Add the fix for PR 37145 as showstopper

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

Add one more vote, after confirming on linux.

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

cast some more votes.

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

* Promote two proposals to acceptances.

    * Revert my -1 on a patch, now that 2.2 has been released
      and offers a choice.

    * cast some votes.

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

update transformation

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

  Correct version and copyright generation, this involves 'long line'
  flavor of the first ASF copyright line; we could use the new macro
  AP_SERVER_COPYRIGHT and defined tokens from this file for versions,
  however this is 2.0 so not expecting that we will do so.

Backports; 368395

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

* Propose fix for PR37791 for backport

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

Update copyright current year to 2006

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

  Fix POSIX deprecation warnings in MSVC14 (Studio 2005)
  Backports fix 357702

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

* Committed as r357454

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

Backport of r357328 from trunk:

* Fix ap_http_chunk_filter to create correct chunks in the case that a
  flush bucket is pre- and postfixed by data buckets in the brigade.

Submitted by: Ruediger Pluem
Reviewed by: Justin Erenkrantz, Joe Orton, Jim Jagielski

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

* Add Justins and Joes vote as per discussion on the list

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

* Add proposal for backport

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

  Test _NMAKE_VER define to determine nmake -nologo behavior,
  and use $(MAKEOPT) -f syntax throughout to avoid problems
  on mingw, borland, etc.

Backport 357226 from trunk
Claiming platform maintainer privs to just fix this for VS2005

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

  Change the misleading message, apr's need to go in the build tree srclib/
  not the install target tree.

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

Fix moderate security issue CVE-2005-3352 mod_imap cross-site scripting flaw

Submitted by: Mark Cox <mjc apache.org>
Reviewed by: jorton, mjc, fielding
PR: 37874

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

  Backport trivial typo fix identified by Jorge Schrauwen <info blackdot.be>
  applied already to 2.2 branch, not present in trunk.

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

update transformation

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

back out accidental commit

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

Backporting httxt2dbm from 2.1/2.2

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

Merge r351819 from trunk:

Point the breadcrump links to the new docs index page.

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

Merge the httxt2dbm backport votes

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

Patch proposal for httxt2dbm

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

* Propose fix for PR37559 for backport

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

vote

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

* Propose fix for PR37566 for backport.

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

drop version reference from the property file; it's no longer needed

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

more URL fixes

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

update transformation

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

centralize versioning of httpd and docs urls

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

update transformation

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

vote

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

* Propose patch for backport

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

* Propose fix for PR37347 for backport

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

Warning about mixing +/- with bareword Options

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

Add CVE name that was allocated after release

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

update transformation

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

  Note release

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

Fix up the NetWare AWK script that extracts the version number so that it matches the new #defines in ap_release.h

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

Typo fix (from noodl@irc)

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

Make changes suggested in bugzilla #37074, update transformation.

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

vote

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

Update transformation to reflect fe80: -> 2001:db8:

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

fe80::/16 is for link-scope link-local addresses in IPv6, they are not
for going in Listen directives, VirtualHost blocks, or anything like
that, and won't work.

Perform a mass search and replace: 2001:db8 for fe80. 2001:db8 is the
IPv6 documentation prefix. See RFC3849 for more details.

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

* Revert commit of r327601

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

* Move two backports from proposed to accepted, as they have enough votes now.

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

* Add comments

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

* Add backport proposal for fixing PR37145

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

Add a vote. Tested on ubuntu, "reviewed" with vimdiff.

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

Today a one-time change happens to all CAN- names as they are
renamed to CVE-.  Make this change to our changelog.

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

Remove CGI block on OPTIONS method so that scripts can
respond to OPTIONS directly rather than via server default.

PR: 15242
Reviewed-by: Paul Querna, Andre Malo, William A. Rowe, Jr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@326253 13f79535-47bb-0310-9956-ffa450edef68

mod_version was merged back. Remove that item.

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

update transformation

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

adjust availability

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

merge mod_version_for_2.0.x branch back to branches/2.0.x
* merge 160788 to 326121 from branches/mod_version_for_2.0.x, but leave out
  generated docs files (will cleanly rebuild later)

Reviewed by: Paul Querna, Bill Rowe, (Justin Erenkrantz), me

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

votes++

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

bump version

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

propse small backport

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

Rpm packaging fix:
- Updated the apr and apr-util dependencies to require at least v0.9.7
- Stop trying to remove *.xml doc files, the httpd build does that already.

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

  Onwards to 2.0.56-dev

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

  Prepare, at last, to tag 2.0.55

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

modules/ssl/ssl_engine_io.c (ssl_io_filter_init): Initialize the
nobuffer flag to zero since the structure is palloc'ed not pcalloc'ed.

PR: 35279
Backport: 189971
Author: jorton
Reviewed by: jerenkrantz, wrowe

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

backport from trunk and 2.2.x:

   SECURITY: CAN-2005-2700 (cve.mitre.org)
   mod_ssl: Fix a security issue where "SSLVerifyClient" was not
   enforced in per-location context if "SSLVerifyClient optional"
   was configured in the vhost configuration.

Submitted by: Joe Orton
Reviewed by: wrowe, trawick

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

Commit Greg's patch to fix worker MPM memory leak.

Approved by: Greg, OtherBill, Jeff

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

  Almost a security hole, but certainly not for mod_echo.  Save other
  protocol modules a significant hole if based purely on mod_echo.

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

Small updates to latex docs build so that I can produce
a new version.

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

  docs/build/ should not exist (docs/manual/build/ already in svn:ignore).

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

  httpd-docs procedures call for checking out build underneath
  the docs/ tree, so add this subdirectory as an svn ignore

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

update transformation

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

swap directive and module

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

vote on backport of CAN-2005-2970 patch

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

did somebody say something?

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

Merge r295104 from trunk:

Refresh the SSL FAQ to bring it a little closer to reality.

Submitted by: Noirin Plunkett <firebird nerdchic.net>
Reviewed by: Joe Orton

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

+1 for CAN-2005-2700

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

Force these cgi thingies to be treated as cgi.

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

vote, note, propose

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

  Undo fat fingers of commit 292397

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

  Small fix to remove unused 'rv' variable from the excluded code path

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

fix svn:keywords properties

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

mod_ldap: Fix PR 36563. Keep track of the number of attributes retrieved from LDAP so that all of the values can be properly cached even if the value is NULL.

Reviewed by: bnicholes, minfrin, jim

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

Vote in PR 36563 patch. Tested on Sol8 and OS X/darwin

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