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

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

* 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

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

* 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

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

Submitted by: rpluem


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

    * 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

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

    * 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

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

* 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

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

* 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

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

* 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

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

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

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

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

    * 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

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

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

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

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

* 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

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

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

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

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

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

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

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

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