* Merge 291277 to 326117 from branches/2.0.x



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

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

* Merge 290201 to 291277 from branches/2.0.x


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

* Merge 239611 to 290201 from branches/2.0.x


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

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

* Merge 219658 to 239611 from branches/2.0.x



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

* Merge 191323 to 219658 from branches/2.0.x



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

* Merge 190230 to 191323 from branches/2.0.x


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

* Merge 179253 to 190230 from branches/2.0.x


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

* Merge r170801 to 179253 from branches/2.0.x


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

* Merge r160788 to r170801 from branches/2.0.x. Docs conflicts revolved
  manually -- never build docs in a branch that's going to be merged back...
* mv 2.0.54 references to 2.0.55
* adjust mod_version copyright notice


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

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

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

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

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

new version api.

Merged from revisions 103345, 106103, 103395, and 102405.


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

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

* STATUS

  Remove vote.

* CHANGES
* docs/manual/mod/mod_cache.xml
* modules/experimental/cache_util.c
* modules/experimental/mod_cache.c
* modules/experimental/mod_cache.h
* modules/experimental/mod_mem_cache.c
* modules/experimental/mod_disk_cache.c

  Add CacheIgnoreHeaders directive.
  PR: 30399
    docs/manual/mod/mod_cache.xml: r1.18
    modules/experimental/cache_util.c: 1.36
    modules/experimental/mod_cache.c: 1.95
    modules/experimental/mod_cache.h: 1.52
    modules/experimental/mod_disk_cache.c: 1.67
    modules/experimental/mod_mem_cache.c: 1.119
      +1: jerenkrantz, stoddard, striker
      +0: sounds like a nice 'feature' v.s. rfc-required behavior, great for 2.2


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

* STATUS

  Remove backport vote.

* modules/dav/main/mod_dav.c

  (dav_finish_multistatus, dav_send_multistatus, dav_method_propfind):
   Send an EOS at the end of the multistatus brigade.
     http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.105&r2=1.106
     +1: jorton, jerenkrantz, pquerna
     nd asks: Sure, you want to drop the return code of ap_pass_brigade?
     jerenkrantz: They already did drop it.  Note that this really isn't
                  a correctness fix; just a perf. fix.  We'd send the EOS
                  later without it.


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

Added a new LDAPConnectionTimeout directive to util_ldap so that the socket connection timeout value is configurable.

Reviewed by: bnicholes, trawick, jim

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

  Commit some votes before this gets out of hand.
  Re-promote a patch (not voted down) to 'under consideration',
  Eliminate a patch I 1) don't know how to write, and 2) would
  only apply to non-OpenSSL solutions, which I no longer hack at.
  Add some notes on our recent dev@httpd discussions.

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

* STATUS

  Remove vote.


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

* STATUS

  Remove vote.

* modules/http/http_request.c
  
  (ap_internal_fast_redirect): Take over important members of the subrequest. 
   Especially the proxyreq copying is interesting for proxying DirectoryIndex'd
   resources:
     http://svn.apache.org/viewcvs.cgi?rev=102330&view=rev
     +1: nd, jerenkrantz, pquerna, striker


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

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

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

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

examples are always good.


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

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

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

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

* STATUS

  Review another backport request and chalk in my vote.

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

* modules/dav/main/mod_dav.h: Wrap all public functions in
  DAV_DECLARE or DAV_DECLARE_NONSTD.
* modules/dav/main/liveprop.c, modules/dav/main/props.c,
  modules/dav/main/util_lock.c, modules/dav/main/mod_dav.c,
  modules/dav/main/std_liveprop.c, modules/dav/main/util.c:
  Update function definitions.

Submitted by: Branko Čibej <brane xbc.nu>
Reviewed by:  Justin Erenkrantz, Paul Querna, Sander Striker


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

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

* manual/mod/leader.xml.es
  manual/vhosts/index.xml.es
  manual/index.xml.es:
    Update translation

* manual/dso.xml.es: new file

Translated by: Jesús Blanco <blanco@bitrock.com>
Reviewed by: Daniel López


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

consensus)


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

  *) worker MPM: Fix a problem which could cause httpd processes to
     remain active after shutdown.  [Jeff Trawick]

  *) Unix MPMs: Shut down the server more quickly when child processes are
     slow to exit.  [Joe Orton, Jeff Trawick]

Reviewed by: stoddard, striker


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

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

  Remove formatting characters from ap_log_error() calls.  These
  were escaped as fallout from CAN-2003-0020.

Submitted by: Eric Covener <ecovener gmail.com>
Reviewed by:  trawick, jorton, pquerna



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

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify): Use
X509_STORE_CTX_get_ex_data() and SSL_get_ex_data_X509_STORE_CTX_idx()
to use the correct ex_data index from the context in pathological
cases where SSL_get_ex_data_X509_STORE_CTX_idx() does not return 0.

PR: 32529
Reviewed by: jorton, trawick, jerenkrantz


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

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Move the
SSLUsername-controlled assignment of r->user earlier.

PR: 31418
Submitted by: dreid
Reviewed by: jorton, jerenkrantz, pquerna, striker


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